summaryrefslogtreecommitdiff
path: root/t/t5515/fetch.br-remote-explicit-merge_remote-explicit
diff options
context:
space:
mode:
authorLibravatar Matthieu Moy <Matthieu.Moy@imag.fr>2009-11-29 13:18:33 +0100
committerLibravatar Junio C Hamano <gitster@pobox.com>2009-11-29 23:52:40 -0800
commite2ced7de19c85f3b246480bfacdcc934c98c08ca (patch)
treede6276eacd244cc8cd9901031b8a7a391ee347b2 /t/t5515/fetch.br-remote-explicit-merge_remote-explicit
parentmerge-recursive: make the error-message generation an extern function (diff)
downloadtgif-e2ced7de19c85f3b246480bfacdcc934c98c08ca.tar.xz
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 't/t5515/fetch.br-remote-explicit-merge_remote-explicit')
0 files changed, 0 insertions, 0 deletions