]> granicus.if.org Git - git/commit
projects / git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 431f4a2) | patch
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)
commitf1e123981177311d5038b033e5b1e89927e213db
treef05c9193574d77113d08d9d45f765f75609bfa63tree | snapshot
parent431f4a26b5a8371de64776028ea511c79f74296acommit | diff
t6036: fix broken "merge fails but has appropriate contents" tests

These tests reference non-existent object "c" when they really mean to
be referencing "C", however, these errors went unnoticed due to a broken
&&-chain later in the tests. Fix these errors, as well as the broken
&&-chains behind which they hid.

Reviewed-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Eric Sunshine <sunshine@sunshineco.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
t/t6036-recursive-corner-cases.sh diff | blob | history
Unnamed repository; edit this file 'description' to name the repository.