grep: --name-only over binary

[git.git] / merge-recursive.c

diff --git a/merge-recursive.c b/merge-recursive.c
index 017cafddd1d6181045b38429789dd594c17d28b9..206c1036359ce7b1fc5a1f5734b2d0bc2a760d90 100644 (file)
--- a/merge-recursive.c
+++ b/merge-recursive.c
@@ -409,7 +409,7 @@ static int remove_file(struct merge_options *o, int clean,
                        return -1;
        }
        if (update_working_directory) {
-               if (remove_path(path) && errno != ENOENT)
+               if (remove_path(path))
                        return -1;
        }
        return 0;
@@ -1347,6 +1347,7 @@ int merge_recursive(struct merge_options *o,
        if (!o->call_depth)
                read_cache();
 
+       o->ancestor = "merged common ancestors";
        clean = merge_trees(o, h1->tree, h2->tree, merged_common_ancestors->tree,
                            &mrtree);