merge-recursive: Allow make_room_for_path() to remove D/F entries

[thirdparty/git.git] / t / t6036-recursive-corner-cases.sh

diff --git a/t/t6036-recursive-corner-cases.sh b/t/t6036-recursive-corner-cases.sh
index ed6c6f45d6d1ddf8211bfe595a729fa69cdf90fe..279f33ca2df89cd9f24af263f7e0106cc57a0304 100755 (executable)
--- a/t/t6036-recursive-corner-cases.sh
+++ b/t/t6036-recursive-corner-cases.sh
@@ -496,7 +496,7 @@ test_expect_success 'setup differently handled merges of directory/file conflict
        git tag E2
 '
 
-test_expect_failure 'merge of D & E1 fails but has appropriate contents' '
+test_expect_success 'merge of D & E1 fails but has appropriate contents' '
        get_clean_checkout D^0 &&
 
        test_must_fail git merge -s recursive E1^0 &&