X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;ds=sidebyside;f=builtin-merge.c;h=56ecc682399b8bf80e29fadf86e057139b9ff0f4;hb=e2ced7de19c85f3b246480bfacdcc934c98c08ca;hp=b6b84286b26a4317dfd5185ae83fd861c6f9fa7d;hpb=bcd45e27d8790d8981d4c6734bc573363121efd3;p=git.git

diff --git a/builtin-merge.c b/builtin-merge.c
index b6b84286b..56ecc6823 100644
--- a/builtin-merge.c
+++ b/builtin-merge.c
@@ -650,6 +650,7 @@ static int checkout_fast_forward(unsigned char *head, unsigned char *remote)
 	opts.verbose_update = 1;
 	opts.merge = 1;
 	opts.fn = twoway_merge;
+	opts.msgs = get_porcelain_error_msgs();
 
 	trees[nr_trees] = parse_tree_indirect(head);
 	if (!trees[nr_trees++])