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

r26421:4b0fc75f default
r32057:e5ffc91a stable
Show More
postinstall.txt
9 lines | 248 B | text/plain | TextLexer
Welcome to Mercurial for Windows!
---------------------------------
For configuration and usage directions, please read the ReadMe.html
file that comes with this package.
Also check the release notes at:
https://mercurial-scm.org/wiki/WhatsNew