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

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

diff: add experimental support for "merge diffs"...
diff: add experimental support for "merge diffs" The way this works is it re-runs the merge and "stores" conflicts, and then diffs against the conflicted result. In a normal merge, you should only see diffs against conflicted regions or in cases where there was a semantic conflict but not a textual one. This makes it easier to detect "evil merges" that contain substantial new work embedded in the merge commit. Differential Revision: https://phab.mercurial-scm.org/D8504
Gregory Szorc - - Load All Authors

File last commit:

r38029:e51c91c1 default
r47177:1a7d12c8 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