--- a/mercurial/merge.py	Thu Aug 14 16:26:41 2014 -0700
+++ b/mercurial/merge.py	Fri Aug 15 02:39:01 2014 +0200
@@ -1052,7 +1052,7 @@
                 cahs = repo.changelog.commonancestorsheads(p1.node(), p2.node())
                 pas = [repo[anc] for anc in (sorted(cahs) or [nullid])]
             else:
-                pas = [p1.ancestor(p2, warn=True)]
+                pas = [p1.ancestor(p2, warn=branchmerge)]
 
         fp1, fp2, xp1, xp2 = p1.node(), p2.node(), str(p1), str(p2)