diff -r eb0b4a2d70a9 -r 9103dab96093 mercurial/merge.py
--- a/mercurial/merge.py	Fri Nov 17 08:06:54 2006 +0100
+++ b/mercurial/merge.py	Sat Nov 18 11:34:19 2006 -0600
@@ -139,6 +139,8 @@
         ''' check if an apparent pair actually matches '''
         c2 = ctx(f2, man[f2])
         ca = c.ancestor(c2)
+        if c == ca or c2 == ca:
+            return
         if ca and ca.path() == c.path() or ca.path() == c2.path():
             copy[c.path()] = f2
             copy[f2] = c.path()