:
'
-test_expect_failure '3-way (1)' '
+test_expect_success '3-way (1)' '
settree A-000 &&
git read-tree -m -u O-000 A-000 B-000 &&
checkindex <<-EOF
EOF
'
-test_expect_failure '3-way (2)' '
+test_expect_success '3-way (2)' '
settree A-001 &&
git read-tree -m -u O-000 A-001 B-000 &&
checkindex <<-EOF