---
merge-recursive.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/merge-recursive.c b/merge-recursive.c
index 7a04ca7..544c504 100644
--- a/merge-recursive.c
+++ b/merge-recursive.c
@@ -1064,7 +1064,7 @@ static int process_renames(struct merge_options *o,
ren1->dst_entry,
ren2->dst_entry);
} else {
- remove_file(o, 1, ren1_src, 1);
+ remove_file(o, 1, ren1_src, 1); // BAD
update_stages_and_entry(ren1_dst,
ren1->dst_entry,
ren1->pair->one,
--
1.7.4
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html