merge-recursive: remove duplicate code

diff --git a/merge-recursive.c b/merge-recursive.c
index b880ae50e7ee4f8e88bda83618529ea30462e4ef..d4292deb5ee2b357208a72065b38e4768e95faa3 100644 (file)
--- a/merge-recursive.c
+++ b/merge-recursive.c
@@ -1773,8 +1773,6 @@ static int process_entry(struct merge_options *o,
                        output(o, 1, _("CONFLICT (%s): There is a directory with name %s in %s. "
                               "Adding %s as %s"),
                               conf, path, other_branch, path, new_path);
-                       if (o->call_depth)
-                               remove_file_from_cache(path);
                        update_file(o, 0, sha, mode, new_path);
                        if (o->call_depth)
                                remove_file_from_cache(path);