X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=blobdiff_plain;f=builtin%2Fmerge.c;h=1bcf7fd9d54c2d65cb27a675c061dc23a16112fa;hb=613e4e5f4046ee36f40199cbaeb9f35442d24378;hp=37ce4f589f6582abf0d1ef5bd263f590a16853d5;hpb=304d8b6256db7aca7772c0a994a7c1c987eabd97;p=git.git

diff --git a/builtin/merge.c b/builtin/merge.c
index 37ce4f589..1bcf7fd9d 100644
--- a/builtin/merge.c
+++ b/builtin/merge.c
@@ -704,7 +704,8 @@ int checkout_fast_forward(const unsigned char *head, const unsigned char *remote
 	opts.verbose_update = 1;
 	opts.merge = 1;
 	opts.fn = twoway_merge;
-	opts.msgs = get_porcelain_error_msgs();
+	opts.show_all_errors = 1;
+	set_porcelain_error_msgs(opts.msgs, "merge");
 
 	trees[nr_trees] = parse_tree_indirect(head);
 	if (!trees[nr_trees++])