# HG changeset patch
# User Matt Mackall <mpm@selenic.com>
# Date 1185469375 18000
# Node ID 54ff1bb4b53a56826f600e9366f765098a45702d
# Parent  81f8ff2a9bf20606fc89bc787983f592183e25b5# Parent  60c54154ec4c764ec2010d5ec21e7918c8a4e4f9
Merge with -stable

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: