2 commits

Author	SHA1	Message	Date
Ævar Arnfjörð Bjarmason	bacec47845	i18n: git-merge basic messages ... Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>	2011-03-09 23:52:55 -08:00
Johannes Sixt	0d6504cc3c	Avoid duplicate test number t7609 ... Signed-off-by: Johannes Sixt <j6t@kdbg.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>	2010-12-13 07:23:51 -08:00

Renamed from t/t7609-merge-abort.sh (Browse further)