t6036: add a failed conflict detection case: regular files, different modes
authorElijah Newren <newren@gmail.com>
Sun, 1 Jul 2018 04:11:22 +0000 (21:11 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 11 Jul 2018 15:40:29 +0000 (08:40 -0700)
commit5d1daf3...cce5744b219002e0a6da015a13216cd1
tree941fd62...23af3f02871c20b38b276b60b223a2e3copy hash to clipboard (tree)
parent451a3ab...262575e5ed325b71547d345c55cc7d1dcopy hash to clipboard (diff)
t/t6036-recursive-corner-cases.sh