mercurial/merge.py
changeset 2973 a31557193f3c
parent 2972 ad558f297eb1
child 2974 cbb90f4bafb0
--- a/mercurial/merge.py	Tue Aug 22 16:47:27 2006 -0500
+++ b/mercurial/merge.py	Tue Aug 22 17:08:38 2006 -0500
@@ -121,11 +121,6 @@
 
     for f in added + modified + unknown:
         mw[f] = ""
-        # is the wfile new and matches m2?
-        if (f not in m1 and f in m2 and
-            not repo.file(f).cmp(m2[f], repo.wread(f))):
-            mw[f] = m2[f]
-
         mw.set(f, util.is_exec(repo.wjoin(f), mw.execf(f)))
 
     for f in deleted + removed: