diff -r 81f8ff2a9bf2 -r 54ff1bb4b53a mercurial/merge.py
--- a/mercurial/merge.py	Wed Jul 25 15:58:10 2007 +0900
+++ b/mercurial/merge.py	Thu Jul 26 12:02:55 2007 -0500
@@ -452,7 +452,7 @@
                 repo.dirstate.forget(f)
         elif m == "f": # forget
             repo.dirstate.forget(f)
-        elif m == "g": # get
+        elif m in "ge": # get or exec change
             if branchmerge:
                 repo.dirstate.normaldirty(f)
             else: