summaryrefslogtreecommitdiff
path: root/t/t6438-submodule-directory-file-conflicts.sh
Commit message (Expand)AuthorAgeFilesLines
* t: mark several submodule merging tests as fixed under merge-ortElijah Newren2021-03-201-2/+5
* Collect merge-related tests to t64xxElijah Newren2020-08-101-0/+19