X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=blobdiff_plain;f=builtin%2Fmerge.c;h=115a28854d8d80d9a2e86a070e7ca2b2a0a54767;hb=08353ebbab2dfdee50a6daa616ec8b6483cb07c8;hp=37ce4f589f6582abf0d1ef5bd263f590a16853d5;hpb=d4f8f74bc6cf8c5851f67d46c49b6e2c8fea601b;p=git.git

diff --git a/builtin/merge.c b/builtin/merge.c
index 37ce4f589..115a28854 100644
--- a/builtin/merge.c
+++ b/builtin/merge.c
@@ -704,7 +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.msgs = get_porcelain_error_msgs();
+	set_porcelain_error_msgs(opts.msgs);
 
 	trees[nr_trees] = parse_tree_indirect(head);
 	if (!trees[nr_trees++])