unpack_trees: group error messages by type
[git/git.git] / builtin / merge.c
index de5a0f6..1bcf7fd 100644 (file)
@@ -704,6 +704,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");
 
        trees[nr_trees] = parse_tree_indirect(head);