Redo "add test_cmp function for test scripts"

We had a handful test updates since we accepted 82ebb0b (add test_cmp
function for test scripts).  This fixes them up.

Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/t/t4201-shortlog.sh b/t/t4201-shortlog.sh
index 672b28859f0612ec7eef15765ccdb006beac27e6..405b97119175a1c0fa75a9db30c6b1ab076cc44e 100755 (executable)
--- a/t/t4201-shortlog.sh
+++ b/t/t4201-shortlog.sh
@@ -50,6 +50,6 @@ test_expect_success 'shortlog wrapping' 'test_cmp expect out'
 git log HEAD > log
 GIT_DIR=non-existing git shortlog -w < log > out
 
-test_expect_success 'shortlog from non-git directory' 'diff -u expect out'
+test_expect_success 'shortlog from non-git directory' 'test_cmp expect out'
 
 test_done

diff --git a/t/t6031-merge-recursive.sh b/t/t6031-merge-recursive.sh
index 5bb6b93780273be6504867f07b864e5ea0194e4d..c8310aee4f77e19281b2559c1f52804c7c98a81d 100755 (executable)
--- a/t/t6031-merge-recursive.sh
+++ b/t/t6031-merge-recursive.sh
@@ -42,7 +42,7 @@ test_expect_success 'mode change in both branches: expect conflict' '
                echo "100755 $H 2       file2"
                echo "100644 $H 3       file2"
        ) >expect &&
-       diff -u actual expect &&
+       test_cmp actual expect &&
        test -x file2
 '