t6036: add a failed conflict detection case with conflicting types
authorElijah Newren <newren@gmail.com>
Sun, 1 Jul 2018 04:11:21 +0000 (21:11 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 3 Jul 2018 21:43:43 +0000 (14:43 -0700)
commit451a3ab...262575e5ed325b71547d345c55cc7d1d
tree930af29...fdb41efe1fc1a0bf32f92ea23cb5c98dcopy hash to clipboard (tree)
parenta79968b...d184029139ddcd0a4e8171a2c84852eecopy hash to clipboard (diff)
t/t6036-recursive-corner-cases.sh