aboutsummaryrefslogtreecommitdiffstats
path: root/t/t6439-merge-co-error-msgs.sh (follow)
AgeCommit message (Expand)AuthorFilesLines
2025-04-08tests: remove GIT_TEST_MERGE_ALGORITHM and test_expect_merge_algorithmElijah Newren1-1/+1
2024-11-21t: remove TEST_PASSES_SANITIZE_LEAK annotationsPatrick Steinhardt1-1/+0
2024-10-24t: fix typosAndrew Kreimer1-1/+1
2023-02-06builtin/merge.c: use fixed strings, not "strbuf", fix leakÆvar Arnfjörð Bjarmason1-0/+1
2022-07-22merge: do not abort early if one strategy fails to handle the mergeElijah Newren1-0/+1
2021-02-10tests: remove most uses of test_i18ncmpÆvar Arnfjörð Bjarmason1-6/+6
2020-11-19t6[4-9]*: adjust the references to the default branch name "main"Johannes Schindelin1-4/+4
2020-11-19tests: mark tests relying on the current default for `init.defaultBranch`Johannes Schindelin1-0/+3
2020-08-10Collect merge-related tests to t64xxElijah Newren1-0/+138