##// END OF EJS Templates
simplemerge: use same newline detection for :mergediff as for :merge[3]...
simplemerge: use same newline detection for :mergediff as for :merge[3] The `:merge` and `:merge3` markers used the newline style detected from the base input. The `:mergediff` style always used LF as newline character. This patch teaches `:mergediff` to use the same detection as the others did. Differential Revision: https://phab.mercurial-scm.org/D11976

File last commit:

r19617:ba89c387 default
r49391:2c802d46 default
Show More
9mail.rc
4 lines | 97 B | text/x-stsrc | TextLexer
# The 9mail to support patchbomb and other email wrappers
[email]
method = /bin/mercurial/9mail