summaryrefslogtreecommitdiffstats
path: root/t/t1015-read-index-unmerged.sh (follow)
Commit message (Expand)AuthorAgeFilesLines
* t: remove TEST_PASSES_SANITIZE_LEAK annotationsPatrick Steinhardt2024-11-211-1/+0
* merge-recursive: fix memory leak when finalizing mergePatrick Steinhardt2024-06-111-0/+2
* read-cache: fix directory/file conflict handling in read_index_unmerged()Elijah Newren2018-07-311-4/+4
* t1015: demonstrate directory/file conflict recovery failuresElijah Newren2018-07-311-0/+123