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

r38031:6f5b4cee default
r47177:1a7d12c8 default
Show More
linux-wheel-centos5-blacklist
3 lines | 59 B | text/plain | TextLexer
/ contrib / packaging / linux-wheel-centos5-blacklist
History | Annotation | Raw |Copy content |Copy permalink
test-convert-git.t
test-subrepo-git.t
test-patchbomb-tls.t