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

File last commit:

r38029:e51c91c1 default
r49408:b5e1283c default
Show More
cacerts.rc
5 lines | 161 B | text/x-stsrc | TextLexer
/ contrib / packaging / debian / cacerts.rc
History | Annotation | Raw |Copy content |Copy permalink
# This config file points Mercurial at the system-wide certificate
# store from the ca-certificates package.
[web]
cacerts = /etc/ssl/certs/ca-certificates.crt