diff -r bbdcdc7f170e -r 90d9ec0dc69d mercurial/merge.py
--- a/mercurial/merge.py	Mon Aug 20 21:10:45 2007 -0500
+++ b/mercurial/merge.py	Thu Aug 23 01:48:29 2007 -0300
@@ -543,7 +543,7 @@
                 # of that file some time in the past. Thus our
                 # merge will appear as a normal local file
                 # modification.
-                repo.dirstate.normaldirty(fd)
+                repo.dirstate.normallookup(fd)
                 if move:
                     repo.dirstate.forget(f)
         elif m == "d": # directory rename