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

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

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
Gregory Szorc - - Load All Authors

File last commit:

r38029:e51c91c1 default
r49393:e8f1414c default
Show More
default-tools.rc
5 lines | 62 B | text/x-stsrc | TextLexer
/ contrib / packaging / debian / default-tools.rc
History | Annotation | Raw |Copy content |Copy permalink
[ui]
editor = sensible-editor
[pager]
pager = sensible-pager