--- a/mercurial/merge.py Tue Dec 08 07:05:37 2015 +0000
+++ b/mercurial/merge.py Mon Dec 07 20:43:24 2015 -0800
@@ -1341,8 +1341,12 @@
fp1, fp2, xp1, xp2 = p1.node(), p2.node(), str(p1), str(p2)
### check phase
- if not overwrite and len(pl) > 1:
- raise error.Abort(_("outstanding uncommitted merge"))
+ if not overwrite:
+ if len(pl) > 1:
+ raise error.Abort(_("outstanding uncommitted merge"))
+ ms = mergestate.read(repo)
+ if list(ms.unresolved()):
+ raise error.Abort(_("outstanding merge conflicts"))
if branchmerge:
if pas == [p2]:
raise error.Abort(_("merging with a working directory ancestor"