diff -r 12df451ce205 -r 89207edf3973 mercurial/merge.py
--- a/mercurial/merge.py	Tue Jan 06 10:30:22 2009 +0100
+++ b/mercurial/merge.py	Wed Jan 07 02:11:17 2009 +0100
@@ -369,7 +369,9 @@
                 repo.dirstate.forget(f)
         elif m == "f": # forget
             repo.dirstate.forget(f)
-        elif m in "ge": # get or exec change
+        elif m == "e": # exec change
+            repo.dirstate.normaldirty(f)
+        elif m == "g": # get
             if branchmerge:
                 repo.dirstate.normaldirty(f)
             else: