##// 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:

r16442:9181188f default
r32057:e5ffc91a stable
Show More
factotum.rc
4 lines | 128 B | text/x-stsrc | TextLexer
# The factotum extension permits factotum(4) to act as an
# authentication agent for HTTP repositories.
[extensions]
factotum =