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