merge-recursive: Fix recursive case with D/F conflict via add/add conflict

diff --git a/t/t6036-recursive-corner-cases.sh b/t/t6036-recursive-corner-cases.sh
index 526a2ea03b8e2aa32bdd12a3cdaaf5257a052e4a..ed6c6f45d6d1ddf8211bfe595a729fa69cdf90fe 100755 (executable)
--- a/t/t6036-recursive-corner-cases.sh
+++ b/t/t6036-recursive-corner-cases.sh
@@ -509,7 +509,7 @@ test_expect_failure 'merge of D & E1 fails but has appropriate contents' '
        test $(git rev-parse :2:a) = $(git rev-parse B:a)
 '
 
-test_expect_failure 'merge of E1 & D fails but has appropriate contents' '
+test_expect_success 'merge of E1 & D fails but has appropriate contents' '
        get_clean_checkout E1^0 &&
 
        test_must_fail git merge -s recursive D^0 &&
@@ -539,7 +539,7 @@ test_expect_success 'merge of D & E2 fails but has appropriate contents' '
        test -f a~HEAD
 '
 
-test_expect_failure 'merge of E2 & D fails but has appropriate contents' '
+test_expect_success 'merge of E2 & D fails but has appropriate contents' '
        get_clean_checkout E2^0 &&
 
        test_must_fail git merge -s recursive D^0 &&