Merge branch 'tr/maint-1.6.5-bash-prompt-show-submodule-changes' into maint-1.6.5

diff --git a/builtin-merge.c b/builtin-merge.c
index d3eb5092c8b20b157fe7c2560d293d6a232a37fd..921453949a1bdccd796b43f29137f419b6416baf 100644 (file)
--- 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++])