--- a/mercurial/merge.py Fri Nov 06 22:32:00 2015 +0800
+++ b/mercurial/merge.py Fri Nov 13 14:24:22 2015 -0800
@@ -1262,7 +1262,6 @@
actions['r'].append((f, None, "prompt delete"))
else:
actions['a'].append((f, None, "prompt keep"))
- del actions['cd'][:]
for f, args, msg in sorted(actions['dc']):
flags, = args
@@ -1271,7 +1270,6 @@
"use (c)hanged version or leave (d)eleted?"
"$$ &Changed $$ &Deleted") % f, 0) == 0:
actions['g'].append((f, (flags,), "prompt recreating"))
- del actions['dc'][:]
# divergent renames
for f, fl in sorted(diverge.iteritems()):