bash: Support git-bisect and its subcommands.

diff --git a/merge-recursive.c b/merge-recursive.c
index a5e68457f45f24a646d22eba5f3e3ed9a46286d0..a68fcc6f377fc5df3ec0527e9bfe552754c81ede 100644 (file)
--- a/merge-recursive.c
+++ b/merge-recursive.c
@@ -891,7 +891,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, index_only);
+                       remove_file(1, ren1_src, index_only || stage == 3);
 
                        hashcpy(src_other.sha1, ren1->src_entry->stages[stage].sha);
                        src_other.mode = ren1->src_entry->stages[stage].mode;