##// END OF EJS Templates
rebase: in --confirm option just abort if hit a conflict...
rebase: in --confirm option just abort if hit a conflict Before this patch, it was prompting the user in both cases 1) when there is no conflict 2) when there is at least one conflict. But for simplicity we can just abort if we hit a conflict and no need to prompt in that case. Differential Revision: https://phab.mercurial-scm.org/D3944

File last commit:

r37513:b1fb341d default
r38701:b3d0c97a @81 default
Show More
MANIFEST.in
7 lines | 109 B | text/plain | TextLexer
Gregory Szorc
zstd: vendor python-zstandard 0.6.0...
r30822 graft c-ext
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