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>

diff --git a/t/t6036-recursive-corner-cases.sh b/t/t6036-recursive-corner-cases.sh
index b5621303d67d47146b4af8ee79fe55c338674071..b32ff8e1dbaa7279ae5bd6a7a493da93ec9a259d 100755 (executable)
--- a/t/t6036-recursive-corner-cases.sh
+++ b/t/t6036-recursive-corner-cases.sh
@@ -506,10 +506,10 @@ test_expect_success 'merge of D & E2 fails but has appropriate contents' '
                test_line_count = 2 out &&
 
                git rev-parse >expect    \
-                       B:a   E2:a/file  c:a/file   A:ignore-me &&
+                       B:a   E2:a/file  C:a/file   A:ignore-me &&
                git rev-parse   >actual   \
                        :2:a  :3:a/file  :1:a/file  :0:ignore-me &&
-               test_cmp expect actual
+               test_cmp expect actual &&
 
                test_path_is_file a~HEAD
        )
@@ -533,10 +533,10 @@ test_expect_success 'merge of E2 & D fails but has appropriate contents' '
                test_line_count = 2 out &&
 
                git rev-parse >expect    \
-                       B:a   E2:a/file  c:a/file   A:ignore-me &&
+                       B:a   E2:a/file  C:a/file   A:ignore-me &&
                git rev-parse   >actual   \
                        :3:a  :2:a/file  :1:a/file  :0:ignore-me &&
-               test_cmp expect actual
+               test_cmp expect actual &&
 
                test_path_is_file a~D^0
        )