Merge branch 'js/merge'

[thirdparty/git.git] / merge-recursive.c

diff --git a/merge-recursive.c b/merge-recursive.c
index 58f2cb4ed3e3cb9450ee1aaf4219f3c337342d02..6dd6e2e5af779f2b3ad5da050776c37646b45a84 100644 (file)
--- a/merge-recursive.c
+++ b/merge-recursive.c
@@ -879,7 +879,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;