t1015: demonstrate directory/file conflict recovery failures
authorElijah Newren <newren@gmail.com>
Tue, 31 Jul 2018 17:12:04 +0000 (10:12 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 31 Jul 2018 19:51:09 +0000 (12:51 -0700)
commit25c200a...0078054b59331d50509481d00647dcbf
treec4ad01a...4524bd3982febee086c18aa1722c26facopy hash to clipboard (tree)
parent53f9a3e...57dbbc901a02ac2c73346d375e24978ccopy hash to clipboard (diff)
t/t1015-read-index-unmerged.sh [new file with mode: 0755]