Move "show_all_errors = 1" to setup_unpack_trees_porcelain()

diff --git a/builtin/merge.c b/builtin/merge.c
index a25951475f08a5a32194bf1e5236d84e7dee91d0..32b4d9d0228d205b1b1c45839aab8955bfad4cac 100644 (file)
--- a/builtin/merge.c
+++ b/builtin/merge.c
@@ -704,7 +704,6 @@ 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;
        setup_unpack_trees_porcelain(&opts, "merge");
 
        trees[nr_trees] = parse_tree_indirect(head);