Mercurial Mercurial > mercurial / diff
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
mercurial/merge.py
changeset 7569 89207edf3973
parent 7066 865c5be0f8df
child 7622 4dd7b28003d2
child 7630 a679bd371091 
--- 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:
mercurial