##// 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:

r47142:ed43b6fa stable
r49393:e8f1414c default
Show More
COPYING.rtf
0 lines | 1.8 KiB | application/rtf | TextLexer
/ contrib / packaging / wix / COPYING.rtf
Binary file (application/rtf)