summaryrefslogtreecommitdiff
path: root/t/t7611-merge-abort.sh
AgeCommit message (Collapse)AuthorFilesLines
2011-04-14i18n: use test_i18n{cmp,grep} in t7600, t7607, t7611 and t7811Libravatar Junio C Hamano1-10/+4
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2011-03-09i18n: git-merge basic messagesLibravatar Ævar Arnfjörð Bjarmason1-4/+16
Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2010-12-13Avoid duplicate test number t7609Libravatar Johannes Sixt1-0/+313
Signed-off-by: Johannes Sixt <j6t@kdbg.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>