builtin-merge: show user-friendly error messages for fast-forward too.
fadd069d03 (merge-recursive: give less scary messages when merge did not start, Sep 7 2009) introduced some friendlier error message for merge failure, but the messages were shown only for non-fast forward merges. This patch uses the same for fast-forward. Signed-off-by: Matthieu Moy <Matthieu.Moy@imag.fr> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Matthieu Moy committed
Nov 29, 2009 at 13:18 UTC
e2ced7de19c85f3b246480bfacdcc934c98c08ca
1 file changed
+1
builtin-merge.c
+1
@@ -650,6 +650,7 @@ static int checkout_fast_forward(unsigned char *head, unsigned char *remote)
650
opts.verbose_update = 1;
651
opts.merge = 1;
652
opts.fn = twoway_merge;
653
+ opts.msgs = get_porcelain_error_msgs();
654
655
trees[nr_trees] = parse_tree_indirect(head);
656
if (!trees[nr_trees++])