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

diff --git a/t/t5323-pack-redundant.sh b/t/t5323-pack-redundant.sh
index 5929c1da49ec8432e0adfed033548862d21a507d..6b4d1ca3536acc2ab03bab3f0d6d06a807effb2e 100755 (executable)
--- a/t/t5323-pack-redundant.sh
+++ b/t/t5323-pack-redundant.sh
@@ -165,8 +165,8 @@ test_expect_success 'master: no redundant for pack 1, 2, 3' '
 #         | T A B C D E F G H I J K L M N O P Q R
 #     ----+--------------------------------------
 #     P1  | x x x x x x x                       x
-#     P2* |     ! ! ! !   ! ! !
-#     P3  |             x     x x x x x
+#     P2  |     x x x x   x x x
+#     P3* |             !     ! ! ! ! !
 #     P4  |                     x x x x     x
 #     P5  |               x x           x x
 #     ----+--------------------------------------
@@ -190,7 +190,7 @@ test_expect_success 'master: one of pack-2/pack-3 is redundant' '
        (
                cd "$master_repo" &&
                cat >expect <<-EOF &&
-                       P2:$P2
+                       P3:$P3
                        EOF
                git pack-redundant --all >out &&
                format_packfiles <out >actual &&