Merge with -stable

mercurial/merge.py

@@ -452,7 +452,7 b' def recordupdates(repo, action, branchme'
                 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: