diff options
| author | Matthieu Moy <Matthieu.Moy@imag.fr> | 2009-11-29 12:18:33 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-11-30 07:52:40 (GMT) |
| commit | e2ced7de19c85f3b246480bfacdcc934c98c08ca (patch) | |
| tree | de6276eacd244cc8cd9901031b8a7a391ee347b2 /builtin-merge.c | |
| parent | 264b774ba6b27cc07ef4c33d52e491d9abf029bb (diff) | |
| download | git-e2ced7de19c85f3b246480bfacdcc934c98c08ca.zip git-e2ced7de19c85f3b246480bfacdcc934c98c08ca.tar.gz git-e2ced7de19c85f3b246480bfacdcc934c98c08ca.tar.bz2 | |
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>
Diffstat (limited to 'builtin-merge.c')
| -rw-r--r-- | builtin-merge.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/builtin-merge.c b/builtin-merge.c index b6b8428..56ecc68 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++]) |