##// 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.
Jeff Sickel - - Load All Authors

File last commit:

r19617:ba89c387 default
r32057:e5ffc91a stable
Show More
9mail.rc
4 lines | 97 B | text/x-stsrc | TextLexer
/ contrib / plan9 / hgrc.d / 9mail.rc
History | Annotation | Raw |Copy content |Copy permalink
# The 9mail to support patchbomb and other email wrappers
[email]
method = /bin/mercurial/9mail