Merge branch 'maint-1.5.4' into maint

diff --git a/t/t3050-subprojects-fetch.sh b/t/t3050-subprojects-fetch.sh
index 34f26a8d9ed809f07d1ae5eec847c2f0ac1d2b5e..2b21b1070d6b8f864aee0049d5cb2dccef0daa46 100755 (executable)
--- a/t/t3050-subprojects-fetch.sh
+++ b/t/t3050-subprojects-fetch.sh
@@ -26,7 +26,7 @@ test_expect_success clone '
                cd cloned &&
                (git rev-parse HEAD; git ls-files -s) >../actual
        ) &&
-       diff -u expected actual
+       test_cmp expected actual
 '
 
 test_expect_success advance '
@@ -46,7 +46,7 @@ test_expect_success fetch '
                git pull &&
                (git rev-parse HEAD; git ls-files -s) >../actual
        ) &&
-       diff -u expected actual
+       test_cmp expected actual
 '
 
 test_done