summaryrefslogtreecommitdiff
path: root/t/t7609-merge-co-error-msgs.sh
Commit message (Collapse)AuthorAgeFilesLines
* t7609-merge-co-error-msgs: test non-fast forward case too.Matthieu Moy2010-09-031-2/+10
| | | | | Signed-off-by: Matthieu Moy <Matthieu.Moy@imag.fr> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* t7609: test merge and checkout error messagesDiane Gasselin2010-08-111-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>