diff options
Diffstat (limited to 't/t1012-read-tree-df.sh')
| -rwxr-xr-x | t/t1012-read-tree-df.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/t/t1012-read-tree-df.sh b/t/t1012-read-tree-df.sh index a961e2ae32..f1e650ac39 100755 --- a/t/t1012-read-tree-df.sh +++ b/t/t1012-read-tree-df.sh @@ -76,7 +76,7 @@ test_expect_failure '3-way (2)' ' EOF ' -test_expect_success '3-way (3)' ' +test_expect_failure '3-way (3)' ' settree A-010 && git read-tree -m -u O-010 A-010 B-010 && checkindex <<-EOF @@ -90,7 +90,7 @@ test_expect_success '3-way (3)' ' EOF ' -test_expect_success '2-way (1)' ' +test_expect_failure '2-way (1)' ' settree O-020 && git read-tree -m -u O-020 A-020 && checkindex <<-EOF |