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

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

histedit: make check for unresolved conflicts explicit (issue5545)...
histedit: make check for unresolved conflicts explicit (issue5545) Previously, we'd rely on the implicit check that `localrepo.commit` did. The problem is that that check only happened when the working copy was dirty. With a "clean" working copy but unresolved conflicts we'd get into a broken state. To fix that, do what rebase does and check for unresolved conflicts at the start of histedit --continue.
Pierre-Yves David - - Load All Authors

File last commit:

r22023:f1883065 default
r32057:e5ffc91a stable
Show More
test-simplemerge.py.out
5 lines | 115 B | text/plain | TextLexer
/ tests / test-simplemerge.py.out
History | Annotation | Raw |Copy content |Copy permalink
................
----------------------------------------------------------------------
Ran 16 tests in 0.000s
OK