summaryrefslogtreecommitdiff
path: root/t/t6438-submodule-directory-file-conflicts.sh
AgeCommit message (Expand)Author
2025-04-08tests: remove GIT_TEST_MERGE_ALGORITHM and test_expect_merge_algorithmElijah Newren
2024-11-21t: remove TEST_PASSES_SANITIZE_LEAK annotationsPatrick Steinhardt
2024-05-27checkout: clarify memory ownership in `unique_tracking_name()`Patrick Steinhardt
2021-03-20t: mark several submodule merging tests as fixed under merge-ortElijah Newren
2020-08-10Collect merge-related tests to t64xxElijah Newren