# HG changeset patch
# User mpm@selenic.com
# Date 1119415253 28800
# Node ID 183c87d4e1a040f1edbc4244cf23c352cfacd867
# Parent  10c43444a38e824b254e3d82a1789deb2a50cd01
Fix typo in merging new files

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Fix typo in merging new files

manifest hash: 4a6fee1e54c5c465a74f4d756a1ac549b15fdb2f
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.0 (GNU/Linux)

iD8DBQFCuOvVywK+sNU5EO8RArovAJ4ua9EhnO8wWfKRZ36E6F4Wrv5JPACghCXn
sHr/TSkxdy48OUVkhTbhhhQ=
=poww
-----END PGP SIGNATURE-----


diff --git a/mercurial/hg.py b/mercurial/hg.py
--- 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: