diff options
Diffstat (limited to 't')
| -rwxr-xr-x | t/t1012-read-tree-df.sh | 4 | ||||
| -rwxr-xr-x | t/t6035-merge-dir-to-symlink.sh | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/t/t1012-read-tree-df.sh b/t/t1012-read-tree-df.sh index a961e2ae3..f1e650ac3 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 diff --git a/t/t6035-merge-dir-to-symlink.sh b/t/t6035-merge-dir-to-symlink.sh index 5b96fb0b3..b9a280e35 100755 --- a/t/t6035-merge-dir-to-symlink.sh +++ b/t/t6035-merge-dir-to-symlink.sh @@ -48,7 +48,7 @@ test_expect_success 'setup for merge test' ' git tag baseline ' -test_expect_success 'do not lose a/b-2/c/d in merge (resolve)' ' +test_expect_failure 'do not lose a/b-2/c/d in merge (resolve)' ' git reset --hard && git checkout baseline^0 && git merge -s resolve master && |