read-cache: fix directory/file conflict handling in read_index_unmerged()
authorElijah Newren <newren@gmail.com>
Tue, 31 Jul 2018 17:12:05 +0000 (10:12 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 31 Jul 2018 19:51:11 +0000 (12:51 -0700)
commitad37620...2a8d0029ff16bcbfbb2656c36cf3d662
tree9eb1746...090a6d355e548bfac0d8ec984cf35e8ecopy hash to clipboard (tree)
parent25c200a...0078054b59331d50509481d00647dcbfcopy hash to clipboard (diff)
read-cache.c
t/t1015-read-index-unmerged.sh
t/t6020-merge-df.sh
t/t6042-merge-rename-corner-cases.sh