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