Remove uncontested renamed files during merge.

diff --git a/merge-recursive.c b/merge-recursive.c
index 32e186c15e7dcdaff99f09a7edcf50a691c7ee74..866a4e480b96147f1a2c2a37cf829d846217e219 100644 (file)
--- a/merge-recursive.c
+++ b/merge-recursive.c
@@ -889,7 +889,7 @@ static int process_renames(struct path_list *a_renames,
                        struct diff_filespec src_other, dst_other;
                        int try_merge, stage = a_renames == renames1 ? 3: 2;
 
-                       remove_file(1, ren1_src, 1);
+                       remove_file(1, ren1_src, index_only);
 
                        hashcpy(src_other.sha1, ren1->src_entry->stages[stage].sha);
                        src_other.mode = ren1->src_entry->stages[stage].mode;