Mercurial Mercurial > hg > mercurial-crew-with-dirclash / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | gz | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge with -stable
authorMatt Mackall <mpm@selenic.com>
Thu, 26 Jul 2007 12:02:55 -0500
changeset 5000 54ff1bb4b53a
parent 4997 81f8ff2a9bf2 (current diff)
parent 4999 60c54154ec4c (diff)
child 5001 46facb73ba8b
Merge with -stable
mercurial/merge.py file | annotate | diff | comparison | revisions 
--- 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.normaldirty(f)
             else:
mercurial-crew-with-dirclash