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

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

filemerge: add support for the new "mergediff" marker style to premerge...
filemerge: add support for the new "mergediff" marker style to premerge This adds support for the new "mergediff" conflict marker style to "merge-tools.<tool>.premerge" (the new value is called "keep-mergediff"). Differential Revision: https://phab.mercurial-scm.org/D9606
Gregory Szorc - - Load All Authors

File last commit:

r38029:e51c91c1 default
r46755:3ca5ca38 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