diff -r 452d171a1b39 -r 8808ea7da86b mercurial/merge.py
--- a/mercurial/merge.py	Wed Jul 04 09:20:56 2007 +0200
+++ b/mercurial/merge.py	Thu Jul 05 13:34:18 2007 -0500
@@ -523,7 +523,7 @@
         raise util.Abort(_("outstanding uncommitted merges"))
     if pa == p1 or pa == p2: # is there a linear path from p1 to p2?
         if branchmerge:
-            if p1.branch() != p2.branch():
+            if p1.branch() != p2.branch() and pa != p2:
                 fastforward = True
             else:
                 raise util.Abort(_("there is nothing to merge, just use "