aboutsummaryrefslogtreecommitdiffstats
path: root/t/t6416-recursive-corner-cases.sh
AgeCommit message (Expand)AuthorFilesLines
2025-04-08tests: remove GIT_TEST_MERGE_ALGORITHM and test_expect_merge_algorithmElijah Newren1-139/+55
2024-11-21t: remove TEST_PASSES_SANITIZE_LEAK annotationsPatrick Steinhardt1-1/+0
2023-10-03merge: free result of repo_get_merge_bases()Jeff King1-0/+1
2022-08-26t64xx: convert 'test_create_repo' to 'git init'Elijah Newren1-19/+19
2021-12-13tests: simplify by dropping unnecessary `for` loopsEric Sunshine1-24/+6
2020-11-19t6[4-9]*: adjust the references to the default branch name "main"Johannes Schindelin1-15/+15
2020-11-19t64*: preemptively adjust alignment to prepare for `master` -> `main`Johannes Schindelin1-4/+4
2020-11-19tests: mark tests relying on the current default for `init.defaultBranch`Johannes Schindelin1-0/+3
2020-10-26t6416: correct expectation for rename/rename(1to2) + directory/fileElijah Newren1-2/+2
2020-10-26merge tests: expect improved directory/file conflict handling in ortElijah Newren1-53/+132
2020-10-26t/: new helper for tests that pass with ort but fail with recursiveElijah Newren1-5/+6
2020-08-10t6416, t6423: clarify some comments and fix some typosElijah Newren1-1/+1
2020-08-10t6416, t6422: fix incorrect untracked file countElijah Newren1-1/+1
2020-08-10Collect merge-related tests to t64xxElijah Newren1-0/+1820