summaryrefslogtreecommitdiff
path: root/t/t6438-submodule-directory-file-conflicts.sh
AgeCommit message (Expand)Author
2021-03-20t: mark several submodule merging tests as fixed under merge-ortElijah Newren
2020-08-10Collect merge-related tests to t64xxElijah Newren