2 commits

Author	SHA1	Message	Date
Matthieu Moy	c5978a507c	t7609-merge-co-error-msgs: test non-fast forward case too. ... Signed-off-by: Matthieu Moy <Matthieu.Moy@imag.fr> Signed-off-by: Junio C Hamano <gitster@pobox.com>	2010-09-03 09:31:59 -07:00
Diane Gasselin	e935e62a0f	t7609: test merge and checkout error messages ... 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>	2010-08-11 10:36:08 -07:00