aboutsummaryrefslogtreecommitdiffstats
path: root/t/t6430-merge-recursive.sh (follow)
AgeCommit message (Expand)AuthorFilesLines
2025-04-08tests: remove GIT_TEST_MERGE_ALGORITHM and test_expect_merge_algorithmElijah Newren1-2/+1
2025-04-08builtin/merge-recursive: switch to using merge_ort_generic()Elijah Newren1-35/+8
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-4/+4
2021-12-13t6000-t9999: detect and signal failure within loopEric Sunshine1-1/+1
2021-09-12tests: remove leftover untracked filesElijah Newren1-1/+3
2020-11-19t6[4-9]*: adjust the references to the default branch name "main"Johannes Schindelin1-10/+10
2020-11-19tests: mark tests relying on the current default for `init.defaultBranch`Johannes Schindelin1-0/+3
2020-10-26t/: new helper for tests that pass with ort but fail with recursiveElijah Newren1-1/+2
2020-10-08tests: avoid using the branch name `main`Johannes Schindelin1-2/+2
2020-08-10Collect merge-related tests to t64xxElijah Newren1-0/+770
generated by cgit v1.2.3 (git 2.39.1) at 2025-12-12 07:22:14 +0000