t6042: Add failing testcases for rename/rename/add-{source,dest} conflicts

diff --git a/t/t6036-recursive-corner-cases.sh b/t/t6036-recursive-corner-cases.sh
index 6c2b2bfa6773d227ed4d6781a54f278201105331..319b6fa41765b75135e92e9f368eb05e79a2939a 100755 (executable)
--- a/t/t6036-recursive-corner-cases.sh
+++ b/t/t6036-recursive-corner-cases.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-test_description='recursive merge corner cases'
+test_description='recursive merge corner cases involving criss-cross merges'
 
 . ./test-lib.sh
 
@@ -15,7 +15,7 @@ test_description='recursive merge corner cases'
 #
 
 test_expect_success 'setup basic criss-cross + rename with no modifications' '
-       ten="0 1 2 3 4 5 6 7 8 9"
+       ten="0 1 2 3 4 5 6 7 8 9" &&
        for i in $ten
        do
                echo line $i in a sample file
@@ -120,7 +120,7 @@ test_expect_success 'setup criss-cross + rename merges with basic modification'
        git tag R2
 '
 
-test_expect_failure 'merge criss-cross + rename merges with basic modification' '
+test_expect_success 'merge criss-cross + rename merges with basic modification' '
        git reset --hard &&
        git checkout L2^0 &&
 
@@ -202,7 +202,7 @@ test_expect_success 'setup differently handled merges of rename/add conflict' '
        git tag E
 '
 
-test_expect_failure 'git detects differently handled merges conflict' '
+test_expect_success 'git detects differently handled merges conflict' '
        git reset --hard &&
        git checkout D^0 &&