git-remote-ext
[gitweb.git] / builtin / merge.c
index 4e4ec898e6cd8bed9f43e2cb8d8958cd6160e766..5f65c0c8a6eacd4c6d05602ad9de2821ec62a034 100644 (file)
@@ -718,8 +718,7 @@ int checkout_fast_forward(const unsigned char *head, const unsigned char *remote
        opts.verbose_update = 1;
        opts.merge = 1;
        opts.fn = twoway_merge;
-       opts.show_all_errors = 1;
-       set_porcelain_error_msgs(opts.msgs, "merge");
+       setup_unpack_trees_porcelain(&opts, "merge");
 
        trees[nr_trees] = parse_tree_indirect(head);
        if (!trees[nr_trees++])