Merge branch 'maint'

diff --git a/t/t4105-apply-fuzz.sh b/t/t4105-apply-fuzz.sh
index 0e8d25f18b0ccf027735017227d9eed10d01bc8b..3266e394003958b62509b7bfe6652abd03fdfcb7 100755 (executable)
--- a/t/t4105-apply-fuzz.sh
+++ b/t/t4105-apply-fuzz.sh
@@ -9,7 +9,7 @@ dotest () {
        test_expect_success "$name" "
                git checkout-index -f -q -u file &&
                git apply $* &&
-               diff -u expect file
+               test_cmp expect file
        "
 }