##// END OF EJS Templates
mergetools.hgrc: set vimdiff to check=changed...
mergetools.hgrc: set vimdiff to check=changed The standard reaction in from of unexpected vimdiff is to ":quit". This will make vimdiff return a 0 status even if no merge were done at all. This change detect that nothing have been changed in vimdiff as a potential unresolved conflict.

File last commit:

r13042:bd9bc412 stable
r17422:93bc65e9 stable
Show More
defines.wxi
9 lines | 135 B | text/plain | TextLexer
<Include>
<?if $(var.Platform) = "x64" ?>
<?define IsX64 = yes ?>
<?else?>
<?define IsX64 = no ?>
<?endif?>
</Include>