unpack_trees(): fix diff-index regression.

diff --git a/builtin-merge-recursive.c b/builtin-merge-recursive.c
index 50b389623cd8dab9adf6b03e62db1af762fac61c..fa02bb5a804a58ea0831e8476aee9a80914667f4 100644 (file)
--- a/builtin-merge-recursive.c
+++ b/builtin-merge-recursive.c
@@ -213,7 +213,8 @@ static int git_merge_trees(int index_only,
        opts.merge = 1;
        opts.head_idx = 2;
        opts.fn = threeway_merge;
-       opts.index = &the_index;
+       opts.src_index = &the_index;
+       opts.dst_index = &the_index;
 
        init_tree_desc_from_tree(t+0, common);
        init_tree_desc_from_tree(t+1, head);