mercurial/merge.py

--- a/mercurial/merge.py	Sun Apr 29 16:18:46 2012 +0200
+++ b/mercurial/merge.py	Sun Apr 29 22:25:55 2012 +0200
@@ -596,7 +596,7 @@
         stats = applyupdates(repo, action, wc, p2, pa, overwrite)
 
         if not partial:
-            repo.dirstate.setparents(fp1, fp2)
+            repo.setparents(fp1, fp2)
             recordupdates(repo, action, branchmerge)
             if not branchmerge:
                 repo.dirstate.setbranch(p2.branch())