setup_unpack_trees_porcelain: take the whole options struct as parameter

diff --git a/merge-recursive.c b/merge-recursive.c
index 85f339ef7ae9ccec2c4de6ad1480ba7df2969dd1..084f54b88c92c2edb48a5aaab2004ed3840d573e 100644 (file)
--- a/merge-recursive.c
+++ b/merge-recursive.c
@@ -185,7 +185,7 @@ static int git_merge_trees(int index_only,
        opts.fn = threeway_merge;
        opts.src_index = &the_index;
        opts.dst_index = &the_index;
-       setup_unpack_trees_porcelain(opts.msgs, "merge");
+       setup_unpack_trees_porcelain(&opts, "merge");
 
        init_tree_desc_from_tree(t+0, common);
        init_tree_desc_from_tree(t+1, head);