diff -r 97253bcb44a8 -r 0b2ee57dfdb1 mercurial/merge.py
--- a/mercurial/merge.py	Tue Jan 13 13:43:42 2009 +0100
+++ b/mercurial/merge.py	Tue Jan 13 23:17:19 2009 +0100
@@ -370,7 +370,7 @@
         elif m == "f": # forget
             repo.dirstate.forget(f)
         elif m == "e": # exec change
-            repo.dirstate.normaldirty(f)
+            repo.dirstate.normallookup(f)
         elif m == "g": # get
             if branchmerge:
                 repo.dirstate.normaldirty(f)