t6036: add a failed conflict detection case with submodule modify/modify
authorElijah Newren <newren@gmail.com>
Sun, 1 Jul 2018 04:11:19 +0000 (21:11 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 3 Jul 2018 21:43:42 +0000 (14:43 -0700)
commitd4d1718...808437fd732a9d14388657b8f609ad4a
treea1540ef...a6a092c6e763095a27da1ac39207e51ecopy hash to clipboard (tree)
parent81f5a2c...7bd9a4a7114e420ef4544cf7ce29ad9bcopy hash to clipboard (diff)
t/t6036-recursive-corner-cases.sh