##// END OF EJS Templates
upstream » mercurial-mirror
RSS

Clone from https://www.mercurial-scm.org/repo/hg-all

merge: consider the file merged when using :merge-{local,other}...
merge: consider the file merged when using :merge-{local,other} Returning `None` from `simplemerge()` means that the caller interprets it as "no merge was necessary (because two sides matched)". See 6217040b2780 and issue2680 for some background. However, `simplemerge()` shouldn't even get called in such scenarios, and returning `None` means that the file is not considered merged, even though the contents actually were. See the affected test cases. Differential Revision: https://phab.mercurial-scm.org/D11999
Gregory Szorc - - Load All Authors

File last commit:

r42086:c68a1df5 default
r49415:50de0890 default
Show More
defines.wxi
9 lines | 135 B | text/plain | TextLexer
/ contrib / packaging / wix / defines.wxi
History | Source | Raw |Copy content |Copy permalink
Gregory Szorc
wix: move contrib/wix to contrib/packaging/wix...
 r42086 <Include>
<?if $(var.Platform) = "x64" ?>
<?define IsX64 = yes ?>
<?else?>
<?define IsX64 = no ?>
<?endif?>
</Include>