Merge branch 'maint-1.6.0' into maint

diff --git a/t/t4115-apply-symlink.sh b/t/t4115-apply-symlink.sh
index a07ff42c2ff8e9a918d83435043a73f6404a9a9e..9ace578f17a07aafc050ccaf935aef8a4a3cab4e 100755 (executable)
--- a/t/t4115-apply-symlink.sh
+++ b/t/t4115-apply-symlink.sh
@@ -33,7 +33,7 @@ test_expect_success 'apply symlink patch' '
        git checkout side &&
        git apply patch &&
        git diff-files -p >patched &&
-       git diff patch patched
+       test_cmp patch patched
 
 '
 
@@ -42,7 +42,7 @@ test_expect_success 'apply --index symlink patch' '
        git checkout -f side &&
        git apply --index patch &&
        git diff-index --cached -p HEAD >patched &&
-       git diff patch patched
+       test_cmp patch patched
 
 '