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

r42237:675775c3 default
r47177:1a7d12c8 default
Show More
MANIFEST.in
9 lines | 139 B | text/plain | TextLexer
/ contrib / python-zstandard / MANIFEST.in
History | Source | Raw |Copy content |Copy permalink
Gregory Szorc
zstd: vendor python-zstandard 0.6.0...
 r30822 graft c-ext
Gregory Szorc
zstandard: vendor python-zstandard 0.10.1...
 r40157 graft debian
Gregory Szorc
zstd: vendor python-zstandard 0.5.0...
 r30435 graft zstd
Gregory Szorc
zstandard: vendor python-zstandard 0.9.0...
 r37513 graft tests
Gregory Szorc
zstd: vendor python-zstandard 0.5.0...
 r30435 include make_cffi.py
Gregory Szorc
zstd: vendor python-zstandard 0.6.0...
 r30822 include setup_zstd.py
include zstd.c
Gregory Szorc
zstandard: vendor python-zstandard 0.9.0...
 r37513 include LICENSE
Gregory Szorc
zstandard: vendor python-zstandard 0.10.1...
 r40157 include NEWS.rst