| commit | f1e123981177311d5038b033e5b1e89927e213db | |
| author | Eric Sunshine <sunshine@sunshineco.com> | |
| Mon, 2 Jul 2018 00:23:49 +0000 (1 20:23 -0400) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Tue, 3 Jul 2018 19:38:05 +0000 (3 12:38 -0700) | ||
| tree | f05c9193574d77113d08d9d45f765f75609bfa63 | treesnapshot (tar.gz zip) |
| parent | 431f4a26b5a8371de64776028ea511c79f74296a | commitdiff |
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>
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 | diffblobblamehistory |