diff options
Diffstat (limited to 't/t4300-merge-tree.sh')
| -rwxr-xr-x | t/t4300-merge-tree.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/t/t4300-merge-tree.sh b/t/t4300-merge-tree.sh index 03e8fcad35..d0b2a457b8 100755 --- 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" && |