Merge branch 'bs/userdiff-php' into maint

diff --git a/t/t4025-hunk-header.sh b/t/t4025-hunk-header.sh
index 9ba06b74ce1a68c49ca76be66743a0c8ebd56cb3..7a3dbc1ea22fd19a54da8949abc368c112377b19 100755 (executable)
--- a/t/t4025-hunk-header.sh
+++ b/t/t4025-hunk-header.sh
@@ -37,7 +37,7 @@ test_expect_success 'hunk header truncation with an overly long line' '
                echo " A $N$N$N$N$N$N$N$N$N2"
                echo " L  $N$N$N$N$N$N$N$N$N1"
        ) >expected &&
-       diff -u actual expected
+       test_cmp actual expected
 
 '