summaryrefslogtreecommitdiff
path: root/t/t1015-read-index-unmerged.sh
AgeCommit message (Expand)AuthorFilesLines
2018-07-31read-cache: fix directory/file conflict handling in read_index_unmerged()Libravatar Elijah Newren1-4/+4
2018-07-31t1015: demonstrate directory/file conflict recovery failuresLibravatar Elijah Newren1-0/+123