Merge branch 'aw/git-p4-deletion' into maint

[git.git] / builtin / merge.c

diff --git a/builtin/merge.c b/builtin/merge.c
index 576e81f14578661461d71230c896436fab3023f9..5f65c0c8a6eacd4c6d05602ad9de2821ec62a034 100644 (file)
--- a/builtin/merge.c
+++ b/builtin/merge.c
@@ -132,6 +132,7 @@ static struct strategy *get_strategy(const char *name)
 
        ret = xcalloc(1, sizeof(struct strategy));
        ret->name = xstrdup(name);
+       ret->attr = NO_TRIVIAL;
        return ret;
 }
 
@@ -717,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++])