tree de6276eacd244cc8cd9901031b8a7a391ee347b2
parent 264b774ba6b27cc07ef4c33d52e491d9abf029bb
author Matthieu Moy <Matthieu.Moy@imag.fr> 1259497113 +0100
committer Junio C Hamano <gitster@pobox.com> 1259567560 -0800

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>