t7610-mergetool: use test_cmp instead of test $(cat file) = $txt

diff --git a/t/t5310-pack-bitmaps.sh b/t/t5310-pack-bitmaps.sh
index 82d7f7f6a5bbdc5609e0b76c97a3ae14f6a53a92..a26c8ba9a2b1b815e1917f703cb3520a7608d624 100755 (executable)
--- a/t/t5310-pack-bitmaps.sh
+++ b/t/t5310-pack-bitmaps.sh
@@ -34,8 +34,7 @@ test_expect_success 'setup repo with moderate-sized history' '
        bitmaptip=$(git rev-parse master) &&
        blob=$(echo tagged-blob | git hash-object -w --stdin) &&
        git tag tagged-blob $blob &&
-       git config repack.writebitmaps true &&
-       git config pack.writebitmaphashcache true
+       git config repack.writebitmaps true
 '
 
 test_expect_success 'full repack creates bitmaps' '
@@ -269,7 +268,7 @@ test_expect_success JGIT 'we can read jgit bitmaps' '
        git clone --bare . compat-jgit.git &&
        (
                cd compat-jgit.git &&
-               rm -f .git/objects/pack/*.bitmap &&
+               rm -f objects/pack/*.bitmap &&
                jgit gc &&
                git rev-list --test-bitmap HEAD
        )