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

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

simplemerge: make merge_lines() a free function...
simplemerge: make merge_lines() a free function IMO, the rendering of a conflict as text with merge markers should be separate from the code for resolving conflicts. The latter is what `Merge3Text` is mostly about already. Differential Revision: https://phab.mercurial-scm.org/D11974
Jeff Sickel - - Load All Authors

File last commit:

r19617:ba89c387 default
r49406:c6649c53 default
Show More
9mail.rc
4 lines | 97 B | text/x-stsrc | TextLexer
/ contrib / plan9 / hgrc.d / 9mail.rc
History | Annotation | Raw |Copy content |Copy permalink
# The 9mail to support patchbomb and other email wrappers
[email]
method = /bin/mercurial/9mail