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

r45245:036f6f7e stable
r49393:e8f1414c default
Show More
requirements.txt.in
2 lines | 16 B | text/plain | TextLexer
Gregory Szorc
packaging: add docutils as dependency...
r45245 docutils
Gregory Szorc
packaging: convert to UNIX line endings...
r44059 jinja2