summaryrefslogtreecommitdiff
path: root/t/t7611-merge-abort.sh
AgeCommit message (Expand)Author
2020-11-19t7[5-9]*: adjust the references to the default branch name "main"Johannes Schindelin
2020-11-19tests: mark tests relying on the current default for `init.defaultBranch`Johannes Schindelin
2018-07-11merge-recursive: enforce rule that index matches head before mergingElijah Newren
2011-04-14i18n: use test_i18n{cmp,grep} in t7600, t7607, t7611 and t7811Junio C Hamano
2011-03-10i18n: git-merge basic messagesÆvar Arnfjörð Bjarmason
2010-12-13Avoid duplicate test number t7609Johannes Sixt