3 commits

Author	SHA1	Message	Date
Clemens Buchacher	7980872d4e	use persistent memory for rejected paths ... An aborted merge prints the list of rejected paths as part of the error message. Since commit f66caaf9 (do not overwrite files in leading path), some of those paths do not have static buffers, so we have to keep a copy. Use string_list's to accomplish this. This changes the order of the list to the order in which the paths are processed. Previously, it was reversed. Signed-off-by: Clemens Buchacher <drizzd@aon.at> Signed-off-by: Junio C Hamano <gitster@pobox.com>	2010-11-15 15:05:34 -08:00
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