diff -r b717f49833a2 -r e68cec5e28b0 mercurial/merge.py --- a/mercurial/merge.py Wed Jan 09 00:01:33 2013 +0100 +++ b/mercurial/merge.py Wed Jan 09 00:01:33 2013 +0100 @@ -402,11 +402,6 @@ updated += 1 else: merged += 1 - if (move and repo.dirstate.normalize(fd) != f - and os.path.lexists(repo.wjoin(f))): - repo.ui.debug("removing %s\n" % f) - audit(f) - os.unlink(repo.wjoin(f)) elif m == "g": # get flags = a[2] repo.ui.note(_("getting %s\n") % f)