aboutsummaryrefslogtreecommitdiffstats
path: root/t/t1015-read-index-unmerged.sh (follow)
AgeCommit message (Expand)AuthorFilesLines
2024-11-21t: remove TEST_PASSES_SANITIZE_LEAK annotationsPatrick Steinhardt1-1/+0
2024-06-11merge-recursive: fix memory leak when finalizing mergePatrick Steinhardt1-0/+2
2018-07-31read-cache: fix directory/file conflict handling in read_index_unmerged()Elijah Newren1-4/+4
2018-07-31t1015: demonstrate directory/file conflict recovery failuresElijah Newren1-0/+123