--- a/mercurial/merge.py	Mon Jun 18 11:13:16 2007 -0700
+++ b/mercurial/merge.py	Mon Jun 18 12:38:54 2007 -0700
@@ -504,7 +504,6 @@
         if branchmerge:
             if p1.branch() != p2.branch():
                 fastforward = True
-                branchmerge = False
             else:
                 raise util.Abort(_("there is nothing to merge, just use "
                                    "'hg update' or look at 'hg heads'"))