# HG changeset patch
# User Matt Mackall <mpm@selenic.com>
# Date 1185466793 18000
# Node ID 60c54154ec4c764ec2010d5ec21e7918c8a4e4f9
# Parent  8d982aef0be135cb780fa03e9b32cb92e9b371f6
merge: don't forget to update the dirstate for exec bit changes

diff --git a/mercurial/merge.py b/mercurial/merge.py
--- a/mercurial/merge.py
+++ b/mercurial/merge.py
@@ -452,7 +452,7 @@ 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.update([f], 'n', st_mtime=-1)
             else: