summaryrefslogtreecommitdiffstats
path: root/t/t6416-recursive-corner-cases.sh (follow)
Commit message (Expand)AuthorAgeFilesLines
* t6416: correct expectation for rename/rename(1to2) + directory/fileElijah Newren2020-10-261-2/+2
* merge tests: expect improved directory/file conflict handling in ortElijah Newren2020-10-261-53/+132
* t/: new helper for tests that pass with ort but fail with recursiveElijah Newren2020-10-261-5/+6
* t6416, t6423: clarify some comments and fix some typosElijah Newren2020-08-111-1/+1
* t6416, t6422: fix incorrect untracked file countElijah Newren2020-08-111-1/+1
* Collect merge-related tests to t64xxElijah Newren2020-08-111-0/+1820