summaryrefslogtreecommitdiffstats
path: root/t/t6438-submodule-directory-file-conflicts.sh (follow)
Commit message (Expand)AuthorAgeFilesLines
* t: remove TEST_PASSES_SANITIZE_LEAK annotationsPatrick Steinhardt2024-11-211-1/+0
* checkout: clarify memory ownership in `unique_tracking_name()`Patrick Steinhardt2024-05-271-0/+1
* t: mark several submodule merging tests as fixed under merge-ortElijah Newren2021-03-201-2/+5
* Collect merge-related tests to t64xxElijah Newren2020-08-111-0/+19