##// END OF EJS Templates
merge: hint about using `hg resolve` for resolving conflicts...
merge: hint about using `hg resolve` for resolving conflicts This was suggested by one of our users at Google. Makes sense to me. Differential Revision: https://phab.mercurial-scm.org/D6755

File last commit:

r42237:675775c3 default
r43072:7b80ad5a default
Show More
MANIFEST.in
9 lines | 139 B | text/plain | TextLexer
graft c-ext
graft debian
graft zstd
graft tests
include make_cffi.py
include setup_zstd.py
include zstd.c
include LICENSE
include NEWS.rst