X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=blobdiff_plain;f=t%2Ft1012-read-tree-df.sh;h=9811d467da5a54eefd68ecfad4c68b67e5b3734f;hb=832ac79edf0e0e9108f5da5b10b496a227667f40;hp=a961e2ae321c99f949dc292b407bba023c43d386;hpb=934f930b3144d03cacd16bc5117ef2afe3b1d04d;p=git.git diff --git a/t/t1012-read-tree-df.sh b/t/t1012-read-tree-df.sh index a961e2ae3..9811d467d 100755 --- a/t/t1012-read-tree-df.sh +++ b/t/t1012-read-tree-df.sh @@ -51,7 +51,7 @@ test_expect_success setup ' : ' -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 @@ -63,7 +63,7 @@ test_expect_failure '3-way (1)' ' 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