Merge branch 'maint-1.5.4' into maint

diff --git a/t/t0003-attributes.sh b/t/t0003-attributes.sh
index e7fa4f5d43ffb95e79a295b3969ea1ad0160a82e..c56d2fbabaa0fdd90547ce8b629a629c21fbbc0e 100755 (executable)
--- a/t/t0003-attributes.sh
+++ b/t/t0003-attributes.sh
@@ -11,7 +11,7 @@ attr_check () {
 
        git check-attr test -- "$path" >actual &&
        echo "$path: test: $2" >expect &&
-       diff -u expect actual
+       test_cmp expect actual
 
 }