##// END OF EJS Templates
upstream » mercurial-mirror
RSS

Clone from https://www.mercurial-scm.org/repo/hg-all

filemerge: add support for the new "mergediff" marker style to premerge...
filemerge: add support for the new "mergediff" marker style to premerge This adds support for the new "mergediff" conflict marker style to "merge-tools.<tool>.premerge" (the new value is called "keep-mergediff"). Differential Revision: https://phab.mercurial-scm.org/D9606
Gregory Szorc - - Load All Authors

File last commit:

r45245:036f6f7e stable
r46755:3ca5ca38 default
Show More
requirements.txt.in
2 lines | 16 B | text/plain | TextLexer
/ contrib / packaging / requirements.txt.in
History | Annotation | Raw |Copy content |Copy permalink
docutils
jinja2