summaryrefslogtreecommitdiff
path: root/t/t1015-read-index-unmerged.sh
AgeCommit message (Expand)Author
2018-07-31read-cache: fix directory/file conflict handling in read_index_unmerged()Elijah Newren
2018-07-31t1015: demonstrate directory/file conflict recovery failuresElijah Newren