summaryrefslogtreecommitdiff
path: root/t/t1015-read-index-unmerged.sh
Commit message (Expand)AuthorAgeFilesLines
* 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