mercurial/merge.py

--- a/mercurial/merge.py	Thu Nov 30 17:36:33 2006 -0600
+++ b/mercurial/merge.py	Thu Nov 30 17:36:33 2006 -0600
@@ -130,7 +130,6 @@
 
     dcopies = repo.dirstate.copies()
     copy = {}
-    match = {}
     u1 = nonoverlap(m1, m2, ma)
     u2 = nonoverlap(m2, m1, ma)
     ctx = util.cachefunc(lambda f, n: repo.filectx(f, fileid=n[:20]))
@@ -150,17 +149,12 @@
         for of in findold(c, limit):
             if of in m2:
                 checkpair(c, of, m2)
-            else:
-                match.setdefault(of, []).append(f)
 
     for f in u2:
         c = ctx(f, m2[f])
         for of in findold(c, limit):
             if of in m1:
                 checkpair(c, of, m1)
-            elif of in match:
-                for mf in match[of]:
-                    checkpair(c, mf, m1)
 
     return copy