Merge branch 'maint-1.5.4' into maint

diff --git a/t/t6031-merge-recursive.sh b/t/t6031-merge-recursive.sh
index 5bb6b93780273be6504867f07b864e5ea0194e4d..c8310aee4f77e19281b2559c1f52804c7c98a81d 100755 (executable)
--- a/t/t6031-merge-recursive.sh
+++ b/t/t6031-merge-recursive.sh
@@ -42,7 +42,7 @@ test_expect_success 'mode change in both branches: expect conflict' '
                echo "100755 $H 2       file2"
                echo "100644 $H 3       file2"
        ) >expect &&
-       diff -u actual expect &&
+       test_cmp actual expect &&
        test -x file2
 '