Merge branch 'ks/doc-checkout-previous'

diff --git a/merge-recursive.c b/merge-recursive.c
index d00b274381e7fff7efd2b38f4328764105d9d7af..a4c280dfc78e943ec541f83ccb0b39921ccdf2b2 100644 (file)
--- a/merge-recursive.c
+++ b/merge-recursive.c
@@ -2082,7 +2082,7 @@ int merge_recursive(struct merge_options *o,
                /* if there is no common ancestor, use an empty tree */
                struct tree *tree;
 
-               tree = lookup_tree(&empty_tree_oid);
+               tree = lookup_tree(the_hash_algo->empty_tree);
                merged_common_ancestors = make_virtual_commit(tree, "ancestor");
        }