changeset 5210 | 90d9ec0dc69d |
parent 5150 | 4ed58fe4fe13 |
child 5371 | 17ed9b9a0d03 |
--- a/mercurial/merge.py +++ b/mercurial/merge.py @@ -543,7 +543,7 @@ def recordupdates(repo, action, branchme # of that file some time in the past. Thus our # merge will appear as a normal local file # modification. - repo.dirstate.normaldirty(fd) + repo.dirstate.normallookup(fd) if move: repo.dirstate.forget(f) elif m == "d": # directory rename