mercurial/hg.py
changeset 428 183c87d4e1a0
parent 421 43b8da7420a9
child 429 688d03d6997a
--- a/mercurial/hg.py
+++ b/mercurial/hg.py
@@ -1052,7 +1052,7 @@ class localrepository:
                 s = 0
 
                 # is the wfile new since m1, and match m2?
-                if n not in m1:
+                if f not in m1:
                     t1 = self.wfile(f).read()
                     t2 = self.file(f).revision(m2[f])
                     if cmp(t1, t2) == 0: