aboutsummaryrefslogtreecommitdiffstats
path: root/t/t6404-recursive-merge.sh (follow)
AgeCommit message (Expand)AuthorFilesLines
2025-04-08tests: remove GIT_TEST_MERGE_ALGORITHM and test_expect_merge_algorithmElijah Newren1-18/+3
2024-11-21t: remove TEST_PASSES_SANITIZE_LEAK annotationsPatrick Steinhardt1-1/+0
2024-10-24t: fix typosAndrew Kreimer1-1/+1
2022-07-27leak tests: mark passing SANITIZE=leak tests as leak-freeÆvar Arnfjörð Bjarmason1-0/+1
2022-02-02merge-ort: capture and print ll-merge warnings in our preferred fashionElijah Newren1-2/+7
2021-02-17Merge branch 'ak/corrected-commit-date'Junio C Hamano1-1/+4
2021-01-18commit-reach: use corrected commit dates in paint_down_to_common()Abhishek Kumar1-1/+4
2020-11-19t6[4-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
2020-10-26t6404, t6423: expect improved rename/delete handling in ort backendElijah Newren1-2/+12
2020-08-10Collect merge-related tests to t64xxElijah Newren1-0/+131
generated by cgit v1.2.3 (git 2.39.1) at 2025-12-11 23:22:50 +0000