aboutsummaryrefslogtreecommitdiffstats
path: root/t/t6436-merge-overwrite.sh (follow)
AgeCommit message (Expand)AuthorFilesLines
2025-04-08tests: remove GIT_TEST_MERGE_ALGORITHM and test_expect_merge_algorithmElijah Newren1-13/+4
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
2021-09-12tests: remove leftover untracked filesElijah Newren1-1/+2
2021-02-10tests: remove most uses of test_i18ncmpÆvar Arnfjörð Bjarmason1-2/+2
2020-11-19t6[4-9]*: adjust the references to the default branch name "main"Johannes Schindelin1-2/+2
2020-11-19tests: mark tests relying on the current default for `init.defaultBranch`Johannes Schindelin1-0/+3
2020-10-26t6423, t6436: note improved ort handling with dirty filesElijah Newren1-5/+13
2020-08-10Collect merge-related tests to t64xxElijah Newren1-0/+195