diff options
| author |  Eric Sunshine <sunshine@sunshineco.com> | 2018-07-01 20:23:49 -0400 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2018-07-03 12:38:05 -0700 |
| commit | f1e123981177311d5038b033e5b1e89927e213db (patch) | |
| tree | f05c9193574d77113d08d9d45f765f75609bfa63 /t/t6021-merge-criss-cross.sh | |
| parent | t5505: modernize and simplify hard-to-digest test (diff) | |
| download | tgif-f1e123981177311d5038b033e5b1e89927e213db.tar.xz | |
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>
Diffstat (limited to 't/t6021-merge-criss-cross.sh')
0 files changed, 0 insertions, 0 deletions