aboutsummaryrefslogtreecommitdiffstats
path: root/t/t6422-merge-rename-corner-cases.sh
AgeCommit message (Expand)AuthorFilesLines
2023-11-02tests: teach callers of test_i18ngrep to use test_grepJunio C Hamano1-8/+8
2023-01-13t6422: drop commented out codeAndrei Rybak1-2/+0
2022-08-26t64xx: convert 'test_create_repo' to 'git init'Elijah Newren1-19/+19
2022-07-01cat-file: fix a common "struct object_context" memory leakÆvar Arnfjörð Bjarmason1-0/+1
2020-11-19t6[4-9]*: adjust the references to the default branch name "main"Johannes Schindelin1-7/+7
2020-11-19t64*: preemptively adjust alignment to prepare for `master` -> `main`Johannes Schindelin1-2/+2
2020-11-19tests: mark tests relying on the current default for `init.defaultBranch`Johannes Schindelin1-0/+3
2020-10-26merge tests: expect improved directory/file conflict handling in ortElijah Newren1-8/+22
2020-10-26t/: new helper for tests that pass with ort but fail with recursiveElijah Newren1-3/+4
2020-08-10t642[23]: be more flexible for add/add conflicts involving pair renamesElijah Newren1-6/+12
2020-08-10t6422, t6426: be more flexible for add/add conflicts involving renamesElijah Newren1-8/+13
2020-08-10t6422: fix multiple errors with the mod6 test expectationsElijah Newren1-9/+10
2020-08-10t6416, t6422: fix incorrect untracked file countElijah Newren1-2/+2
2020-08-10t6422: fix bad check against missing fileElijah Newren1-3/+3
2020-08-10Collect merge-related tests to t64xxElijah Newren1-0/+1437