t6036: fix broken "merge fails but has appropriate contents" tests
authorEric Sunshine <sunshine@sunshineco.com>
Mon, 2 Jul 2018 00:23:49 +0000 (20:23 -0400)
committerJunio C Hamano <gitster@pobox.com>
Tue, 3 Jul 2018 19:38:05 +0000 (12:38 -0700)
commitf1e1239...1177311d5038b033e5b1e89927e213db
treef05c919...574d77113d08d9d45f765f75609bfa63copy hash to clipboard (tree)
parent431f4a2...b5a8371de64776028ea511c79f74296acopy hash to clipboard (diff)
t/t6036-recursive-corner-cases.sh