summaryrefslogtreecommitdiff
path: root/t/t7611-merge-abort.sh
Commit message (Expand)AuthorAgeFilesLines
* i18n: use test_i18n{cmp,grep} in t7600, t7607, t7611 and t7811Junio C Hamano2011-04-141-10/+4
* i18n: git-merge basic messagesÆvar Arnfjörð Bjarmason2011-03-091-4/+16
* Avoid duplicate test number t7609Johannes Sixt2010-12-131-0/+313