diff --git a/merge-recursive.c b/merge-recursive.c
index a5e68457f45f24a646d22eba5f3e3ed9a46286d0..58989424d77467da018e7daf5761f1f85040d2f6 100644 (file)
--- a/merge-recursive.c
+++ b/merge-recursive.c
struct diff_filespec src_other, dst_other;
int try_merge, stage = a_renames == renames1 ? 3: 2;
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;
hashcpy(src_other.sha1, ren1->src_entry->stages[stage].sha);
src_other.mode = ren1->src_entry->stages[stage].mode;
tree->object.parsed = 1;
tree->object.type = OBJ_TREE;
tree->object.parsed = 1;
tree->object.type = OBJ_TREE;
- write_sha1_file(NULL, 0, tree_type, tree->object.sha1);
+ pretend_sha1_file(NULL, 0, tree_type, tree->object.sha1);
merged_common_ancestors = make_virtual_commit(tree, "ancestor");
}
merged_common_ancestors = make_virtual_commit(tree, "ancestor");
}