summaryrefslogtreecommitdiffstats
path: root/t/t6400-merge-df.sh (follow)
Commit message (Expand)AuthorAgeFilesLines
* merge tests: expect improved directory/file conflict handling in ortElijah Newren2020-10-261-2/+12
* tests: avoid using the branch name `main`Johannes Schindelin2020-10-081-4/+4
* Collect merge-related tests to t64xxElijah Newren2020-08-111-0/+150