summaryrefslogtreecommitdiff
path: root/t/t6438-submodule-directory-file-conflicts.sh
Commit message (Expand)AuthorAgeFilesLines
* Collect merge-related tests to t64xxElijah Newren2020-08-101-0/+19