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

r38031:6f5b4cee default
r49393:e8f1414c default
Show More
linux-wheel-centos5-blacklist
3 lines | 59 B | text/plain | TextLexer
/ contrib / packaging / linux-wheel-centos5-blacklist
test-convert-git.t
test-subrepo-git.t
test-patchbomb-tls.t