summaryrefslogtreecommitdiff
path: root/t/t6422-merge-rename-corner-cases.sh
AgeCommit message (Expand)AuthorFilesLines
2020-11-19t6[4-9]*: adjust the references to the default branch name "main"Libravatar Johannes Schindelin1-7/+7
2020-11-19t64*: preemptively adjust alignment to prepare for `master` -> `main`Libravatar Johannes Schindelin1-2/+2
2020-11-19tests: mark tests relying on the current default for `init.defaultBranch`Libravatar Johannes Schindelin1-0/+3
2020-10-26merge tests: expect improved directory/file conflict handling in ortLibravatar Elijah Newren1-8/+22
2020-10-26t/: new helper for tests that pass with ort but fail with recursiveLibravatar Elijah Newren1-3/+4
2020-08-10t642[23]: be more flexible for add/add conflicts involving pair renamesLibravatar Elijah Newren1-6/+12
2020-08-10t6422, t6426: be more flexible for add/add conflicts involving renamesLibravatar Elijah Newren1-8/+13
2020-08-10t6422: fix multiple errors with the mod6 test expectationsLibravatar Elijah Newren1-9/+10
2020-08-10t6416, t6422: fix incorrect untracked file countLibravatar Elijah Newren1-2/+2
2020-08-10t6422: fix bad check against missing fileLibravatar Elijah Newren1-3/+3
2020-08-10Collect merge-related tests to t64xxLibravatar Elijah Newren1-0/+1437