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

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

merge: consider the file merged when using :merge-{local,other}...
merge: consider the file merged when using :merge-{local,other} Returning `None` from `simplemerge()` means that the caller interprets it as "no merge was necessary (because two sides matched)". See 6217040b2780 and issue2680 for some background. However, `simplemerge()` shouldn't even get called in such scenarios, and returning `None` means that the file is not considered merged, even though the contents actually were. See the affected test cases. Differential Revision: https://phab.mercurial-scm.org/D11999
Gregory Szorc - - Load All Authors

File last commit:

r42237:675775c3 default
r49415:50de0890 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