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

r16442:9181188f default
r49408:b5e1283c default
Show More
factotum.rc
4 lines | 128 B | text/x-stsrc | TextLexer
# The factotum extension permits factotum(4) to act as an
# authentication agent for HTTP repositories.
[extensions]
factotum =