---
merge-recursive.c | 4 ++++
1 files changed, 4 insertions(+), 0 deletions(-)
diff --git a/merge-recursive.c b/merge-recursive.c
index 6dc74dc..8d28a54 100644
--- a/merge-recursive.c
+++ b/merge-recursive.c
@@ -908,6 +908,10 @@ static void conflict_rename_rename_1to2(struct merge_options *o,
ren2_dst, branch1, dst_name2);
}
if (o->call_depth) {
+ /*
+ * FIXME: This is bogus. dst_nameX are not in cache in
+ * case of D/F conflict.
+ */
remove_file_from_cache(dst_name1);
remove_file_from_cache(dst_name2);
/*
--
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