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)
Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
No differences found