diff --git a/builtin-merge.c b/builtin-merge.c
index f4de73fa9d8d4ca4d311cb86d6901346ceb0d19f..56ecc682399b8bf80e29fadf86e057139b9ff0f4 100644 (file)
--- a/builtin-merge.c
+++ b/builtin-merge.c
discard_cache();
if (read_cache() < 0)
die("failed to read the cache");
- return -ret;
+ return ret;
}
}
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++])