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

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

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
Martin von Zweigbergk -
r49408:b5e1283c default
Show More
Name Size Modified Last Commit Author
/ mercurial / hgweb
__init__.py Loading ...
common.py Loading ...
hgweb_mod.py Loading ...
hgwebdir_mod.py Loading ...
request.py Loading ...
server.py Loading ...
webcommands.py Loading ...
webutil.py Loading ...
wsgicgi.py Loading ...
wsgiheaders.py Loading ...