##// END OF EJS Templates
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.

File last commit:

r28809:7a1ad08b default
r32057:e5ffc91a stable
Show More
test-gendoc-da.t
4 lines | 84 B | text/troff | Tads3Lexer
#require docutils gettext
$ $TESTDIR/check-gendoc da
checking for parse errors