setup_unpack_trees_porcelain: take the whole options struct as parameter

diff --git a/builtin/merge.c b/builtin/merge.c
index 20a28b21809f1882cee57e0d9c50666115ec10dd..a25951475f08a5a32194bf1e5236d84e7dee91d0 100644 (file)
--- a/builtin/merge.c
+++ b/builtin/merge.c
@@ -705,7 +705,7 @@ int checkout_fast_forward(const unsigned char *head, const unsigned char *remote
        opts.merge = 1;
        opts.fn = twoway_merge;
        opts.show_all_errors = 1;
-       setup_unpack_trees_porcelain(opts.msgs, "merge");
+       setup_unpack_trees_porcelain(&opts, "merge");
 
        trees[nr_trees] = parse_tree_indirect(head);
        if (!trees[nr_trees++])