summaryrefslogtreecommitdiffstats
path: root/t/t6402-merge-rename.sh (follow)
Commit message (Expand)AuthorAgeFilesLines
* merge tests: expect slight differences in output for recursive vs. ortElijah Newren2020-10-261-2/+12
* merge tests: expect improved directory/file conflict handling in ortElijah Newren2020-10-261-27/+81
* Collect merge-related tests to t64xxElijah Newren2020-08-111-0/+910