##// END OF EJS Templates
merge: check that there are no conflicts after --abort...
merge: check that there are no conflicts after --abort Same idea as in abcc82bf0717 (clean: check that there are no conflicts after, 2020-01-24). We should reuse more code here, but that will come later. Differential Revision: https://phab.mercurial-scm.org/D7994

File last commit:

r42237:675775c3 default
r44636:2b6632d6 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