Merge branch 'cb/merge-recursive-fix'

diff --git a/t/t4012-diff-binary.sh b/t/t4012-diff-binary.sh
index 421f4bba3fbc666cf2ab7ec4289f10d29d61eebb..3cf5b5c4ea05d861d75aa146a52d7d273dcaa4cb 100755 (executable)
--- a/t/t4012-diff-binary.sh
+++ b/t/t4012-diff-binary.sh
@@ -25,11 +25,11 @@ cat > expected <<\EOF
 EOF
 test_expect_success 'diff without --binary' \
        'git diff | git apply --stat --summary >current &&
-        cmp current expected'
+        test_cmp expected current'
 
 test_expect_success 'diff with --binary' \
        'git diff --binary | git apply --stat --summary >current &&
-        cmp current expected'
+        test_cmp expected current'
 
 # apply needs to be able to skip the binary material correctly
 # in order to report the line number of a corrupt patch.