summaryrefslogtreecommitdiff
path: root/t/t7609-merge-co-error-msgs.sh
AgeCommit message (Collapse)AuthorFilesLines
2010-09-03t7609-merge-co-error-msgs: test non-fast forward case too.Libravatar Matthieu Moy1-2/+10
Signed-off-by: Matthieu Moy <Matthieu.Moy@imag.fr> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2010-08-11t7609: test merge and checkout error messagesLibravatar Diane Gasselin1-0/+125
Test porcelain and plumbing error messages for different types of errors of merge and checkout. Signed-off-by: Matthieu Moy <Matthieu.Moy@imag.fr> Signed-off-by: Junio C Hamano <gitster@pobox.com>