projects / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 264b774) | patch
builtin-merge: show user-friendly error messages for fast-forward too.
authorMatthieu Moy <Matthieu.Moy@imag.fr>
Sun, 29 Nov 2009 12:18:33 +0000 (13:18 +0100)
committerJunio C Hamano <gitster@pobox.com>
Mon, 30 Nov 2009 07:52:40 +0000 (23:52 -0800)
commite2ced7de19c85f3b246480bfacdcc934c98c08ca
treede6276eacd244cc8cd9901031b8a7a391ee347b2tree | snapshot
parent264b774ba6b27cc07ef4c33d52e491d9abf029bbcommit | diff
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>
builtin-merge.c diff | blob | history
Git—the stupid content tracker