| commit | e2ced7de19c85f3b246480bfacdcc934c98c08ca | |
| author | Matthieu Moy <Matthieu.Moy@imag.fr> | |
| Sun, 29 Nov 2009 12:18:33 +0000 (29 13:18 +0100) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Mon, 30 Nov 2009 07:52:40 +0000 (29 23:52 -0800) | ||
| tree | de6276eacd244cc8cd9901031b8a7a391ee347b2 | treesnapshot (tar.gz zip) |
| parent | 264b774ba6b27cc07ef4c33d52e491d9abf029bb | commitdiff |
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>
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>
| builtin-merge.c | diffblobblamehistory |