git diff: rename test that had a conflicting name

[git.git] / merge-recursive.c

diff --git a/merge-recursive.c b/merge-recursive.c
index 017cafddd1d6181045b38429789dd594c17d28b9..917397ca7a0c3a702681e1c3e93eb385bb6f28fb 100644 (file)
--- a/merge-recursive.c
+++ b/merge-recursive.c
@@ -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);