merge & sequencer: turn "Conflicts:" hint into a comment

diff --git a/t/t0090-cache-tree.sh b/t/t0090-cache-tree.sh
index 3d0702a6f9e09fa5fd1b983d8f7f548870bf34dc..6c33e28ee8df4d239dd6d1c1d98c324b01c70ed3 100755 (executable)
--- a/t/t0090-cache-tree.sh
+++ b/t/t0090-cache-tree.sh
@@ -17,15 +17,13 @@ cmp_cache_tree () {
 # test-dump-cache-tree already verifies that all existing data is
 # correct.
 test_shallow_cache_tree () {
-       echo "SHA " \
-           "($(git ls-files|wc -l) entries, 0 subtrees)" >expect &&
+       printf "SHA  (%d entries, 0 subtrees)\n" $(git ls-files|wc -l) >expect &&
        cmp_cache_tree expect
 }
 
 test_invalid_cache_tree () {
        echo "invalid                                   (0 subtrees)" >expect &&
-       echo "SHA #(ref) " \
-           "($(git ls-files|wc -l) entries, 0 subtrees)" >>expect &&
+       printf "SHA #(ref)  (%d entries, 0 subtrees)\n" $(git ls-files|wc -l) >>expect &&
        cmp_cache_tree expect
 }
 
@@ -70,18 +68,18 @@ test_expect_success 'test-scrap-cache-tree works' '
        test_no_cache_tree
 '
 
-test_expect_failure 'second commit has cache-tree' '
+test_expect_success 'second commit has cache-tree' '
        test_commit bar &&
        test_shallow_cache_tree
 '
 
-test_expect_failure 'reset --hard gives cache-tree' '
+test_expect_success 'reset --hard gives cache-tree' '
        test-scrap-cache-tree &&
        git reset --hard &&
        test_shallow_cache_tree
 '
 
-test_expect_failure 'reset --hard without index gives cache-tree' '
+test_expect_success 'reset --hard without index gives cache-tree' '
        rm -f .git/index &&
        git reset --hard &&
        test_shallow_cache_tree