changeset 4999 | 60c54154ec4c |
parent 4890 | 931f901ab811 |
child 5000 | 54ff1bb4b53a |
child 5045 | f191bc3916f7 |
--- 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: