Merge branch 'ap/status-ignored-in-ignored-directory'

diff --git a/t/t4300-merge-tree.sh b/t/t4300-merge-tree.sh
index 03e8fcad35c6a3ee9c1214d5783494a742bb283e..d0b2a457b8bf30fc7ab472ff6b2576ff319432f7 100755 (executable)
--- a/t/t4300-merge-tree.sh
+++ b/t/t4300-merge-tree.sh
@@ -254,7 +254,7 @@ EXPECTED
        test_cmp expected actual
 '
 
-test_expect_failure 'turn file to tree' '
+test_expect_success 'turn file to tree' '
        git reset --hard initial &&
        rm initial-file &&
        mkdir initial-file &&
@@ -274,7 +274,7 @@ test_expect_failure 'turn file to tree' '
        test_cmp expect actual
 '
 
-test_expect_failure 'turn tree to file' '
+test_expect_success 'turn tree to file' '
        git reset --hard initial &&
        mkdir dir &&
        test_commit "add-tree" "dir/path" "AAA" &&