summaryrefslogtreecommitdiff
path: root/t/t7611-merge-abort.sh
AgeCommit message (Expand)AuthorFilesLines
2018-07-11merge-recursive: enforce rule that index matches head before mergingLibravatar Elijah Newren1-118/+0
2011-04-14i18n: use test_i18n{cmp,grep} in t7600, t7607, t7611 and t7811Libravatar Junio C Hamano1-10/+4
2011-03-09i18n: git-merge basic messagesLibravatar Ævar Arnfjörð Bjarmason1-4/+16
2010-12-13Avoid duplicate test number t7609Libravatar Johannes Sixt1-0/+313