##// END OF EJS Templates
simplemerge: split out function for rendering :merge3 conflict markers...
simplemerge: split out function for rendering :merge3 conflict markers The results in some duplicate, but the code is very straight-forward and I think it's worth it to have each conflict marker style in a separate function. Differential Revision: https://phab.mercurial-scm.org/D11978

File last commit:

r42086:c68a1df5 default
r49393:e8f1414c default
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>