changeset 23362 | cc83cac41619 |
parent 23351 | 1cbc00ff2373 |
child 23380 | 90cc552ceed5 |
--- a/mercurial/merge.py Fri Oct 17 22:23:06 2014 -0700 +++ b/mercurial/merge.py Wed Nov 19 08:50:08 2014 -0800 @@ -500,7 +500,6 @@ if not force and different: aborts.append((f, "ud")) else: - # if different: old untracked f may be overwritten and lost if acceptremote: actions['g'].append((f, (fl2,), "remote recreating")) else: