summaryrefslogtreecommitdiff
path: root/t/t6422-merge-rename-corner-cases.sh
Commit message (Expand)AuthorAgeFilesLines
* t642[23]: be more flexible for add/add conflicts involving pair renamesElijah Newren2020-08-101-6/+12
* t6422, t6426: be more flexible for add/add conflicts involving renamesElijah Newren2020-08-101-8/+13
* t6422: fix multiple errors with the mod6 test expectationsElijah Newren2020-08-101-9/+10
* t6416, t6422: fix incorrect untracked file countElijah Newren2020-08-101-2/+2
* t6422: fix bad check against missing fileElijah Newren2020-08-101-3/+3
* Collect merge-related tests to t64xxElijah Newren2020-08-101-0/+1437