aboutsummaryrefslogtreecommitdiffstats
path: root/t/t7611-merge-abort.sh
AgeCommit message (Expand)AuthorFilesLines
2024-12-27t7611: replace test -f with test_path_is* helpersMeet Soni1-17/+17
2024-11-21t: remove TEST_PASSES_SANITIZE_LEAK annotationsPatrick Steinhardt1-1/+0
2024-06-11merge: fix leaking merge basesPatrick Steinhardt1-0/+1
2023-11-02tests: teach callers of test_i18ngrep to use test_grepJunio C Hamano1-2/+2
2020-11-19t7[5-9]*: adjust the references to the default branch name "main"Johannes Schindelin1-3/+3
2020-11-19tests: mark tests relying on the current default for `init.defaultBranch`Johannes Schindelin1-0/+3
2018-07-11merge-recursive: enforce rule that index matches head before mergingElijah Newren1-118/+0
2011-04-14i18n: use test_i18n{cmp,grep} in t7600, t7607, t7611 and t7811Junio C Hamano1-10/+4
2011-03-09i18n: git-merge basic messagesÆvar Arnfjörð Bjarmason1-4/+16
2010-12-13Avoid duplicate test number t7609Johannes Sixt1-0/+313