Make 'unpack_trees()' take the index to work on as an argument
[git/git.git] / builtin-merge-recursive.c
index 6fe4102..50b3896 100644 (file)
@@ -213,6 +213,7 @@ static int git_merge_trees(int index_only,
        opts.merge = 1;
        opts.head_idx = 2;
        opts.fn = threeway_merge;
+       opts.index = &the_index;
 
        init_tree_desc_from_tree(t+0, common);
        init_tree_desc_from_tree(t+1, head);