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

diff --git a/t/t4025-hunk-header.sh b/t/t4025-hunk-header.sh
index 7a3dbc1ea22fd19a54da8949abc368c112377b19..35578f2bb91dab8a00f40b5fbb26bd0a31ca7d58 100755 (executable)
--- a/t/t4025-hunk-header.sh
+++ b/t/t4025-hunk-header.sh
@@ -12,12 +12,12 @@ NS="$N$N$N$N$N$N$N$N$N$N$N$N$N"
 test_expect_success setup '
 
        (
-               echo "A $NS"
+               echo "A $NS" &&
                for c in B C D E F G H I J K
                do
                        echo "  $c"
-               done
-               echo "L  $NS"
+               done &&
+               echo "L  $NS" &&
                for c in M N O P Q R S T U V
                do
                        echo "  $c"
@@ -34,10 +34,10 @@ test_expect_success 'hunk header truncation with an overly long line' '
 
        git diff | sed -n -e "s/^.*@@//p" >actual &&
        (
-               echo " A $N$N$N$N$N$N$N$N$N2"
+               echo " A $N$N$N$N$N$N$N$N$N2" &&
                echo " L  $N$N$N$N$N$N$N$N$N1"
        ) >expected &&
-       test_cmp actual expected
+       test_cmp expected actual
 
 '