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

r7659:25ac72ca default
r49410:69e76b2a default
Show More
mercurial.ico
0 lines | 2.2 KiB | image/x-icon | TextLexer
/ contrib / win32 / mercurial.ico
rendered-image