summaryrefslogtreecommitdiff
path: root/t/t6430-merge-recursive.sh
Commit message (Expand)AuthorAgeFilesLines
* tests: remove leftover untracked filesElijah Newren2021-09-121-1/+3
* t6[4-9]*: adjust the references to the default branch name "main"Johannes Schindelin2020-11-191-10/+10
* tests: mark tests relying on the current default for `init.defaultBranch`Johannes Schindelin2020-11-191-0/+3
* t/: new helper for tests that pass with ort but fail with recursiveElijah Newren2020-10-261-1/+2
* tests: avoid using the branch name `main`Johannes Schindelin2020-10-081-2/+2
* Collect merge-related tests to t64xxElijah Newren2020-08-101-0/+770