summaryrefslogtreecommitdiff
path: root/t/t7611-merge-abort.sh
Commit message (Expand)AuthorAgeFilesLines
* i18n: git-merge basic messagesÆvar Arnfjörð Bjarmason2011-03-091-4/+16
* Avoid duplicate test number t7609Johannes Sixt2010-12-131-0/+313