Merge branch 'jl/status-reduce-vertical-blank'

diff --git a/t/t7201-co.sh b/t/t7201-co.sh
index f1655820194278fb36ee7c7a73a83f869d040589..5990299fc9555d54a59a5de462864a7a98e83e45 100755 (executable)
--- a/t/t7201-co.sh
+++ b/t/t7201-co.sh
@@ -224,15 +224,7 @@ test_expect_success 'switch to another branch while carrying a deletion' '
        test_i18ngrep overwritten errs &&
 
        test_must_fail git read-tree --quiet -m -u HEAD simple 2>errs &&
-       test_must_be_empty errs &&
-
-       git checkout --merge simple 2>errs &&
-       test_i18ngrep ! overwritten errs &&
-       git ls-files -u &&
-       test_must_fail git cat-file -t :0:two &&
-       test "$(git cat-file -t :1:two)" = blob &&
-       test "$(git cat-file -t :2:two)" = blob &&
-       test_must_fail git cat-file -t :3:two
+       test_must_be_empty errs
 '
 
 test_expect_success 'checkout to detach HEAD (with advice declined)' '