Mercurial Mercurial > hg / diff
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
mercurial/merge.py
branchstable
changeset 21203 9f12d8665c7b
parent 21172 0f0059af920c
child 21261 6ca05c46aa95 
--- a/mercurial/merge.py	Fri Apr 25 13:44:51 2014 -0700
+++ b/mercurial/merge.py	Wed Apr 30 14:19:01 2014 -0500
@@ -992,7 +992,7 @@
                 cahs = repo.changelog.commonancestorsheads(p1.node(), p2.node())
                 pas = [repo[anc] for anc in (sorted(cahs) or [nullid])]
             else:
-                pas = [p1.ancestor(p2)]
+                pas = [p1.ancestor(p2, warn=True)]
 
         fp1, fp2, xp1, xp2 = p1.node(), p2.node(), str(p1), str(p2)
Mercurial