Mercurial > public > mercurial-scm > hg

diff mercurial/merge.py @ 7631:0b2ee57dfdb1

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge with crew-stable
author Patrick Mezard <pmezard@gmail.com>
date Tue, 13 Jan 2009 23:17:19 +0100
parents 4dd7b28003d2 a679bd371091
children 5bf5fd1e2a74
line wrap: on
line diff
--- a/mercurial/merge.py	Tue Jan 13 13:43:42 2009 +0100
+++ b/mercurial/merge.py	Tue Jan 13 23:17:19 2009 +0100
@@ -370,7 +370,7 @@
         elif m == "f": # forget
             repo.dirstate.forget(f)
         elif m == "e": # exec change
-            repo.dirstate.normaldirty(f)
+            repo.dirstate.normallookup(f)
         elif m == "g": # get
             if branchmerge:
                 repo.dirstate.normaldirty(f)