##// 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
Martin von Zweigbergk -
r49393:e8f1414c default
Show More
Name Size Modified Last Commit Author
/ contrib / packaging / docker
centos7 Loading ...
centos8 Loading ...
debian.template Loading ...
fedora.template Loading ...
ubuntu.template Loading ...