author | Matt Mackall <mpm@selenic.com> |
Thu, 26 Jul 2007 11:19:53 -0500 | |
changeset 4999 | 60c54154ec4c |
parent 4966 | 8d982aef0be1 |
child 5000 | 54ff1bb4b53a |
child 5029 | ac97e065cfc7 |
--- 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: