Merge branch 'maint-1.5.4' into maint

diff --git a/t/t4150-am-subdir.sh b/t/t4150-am-subdir.sh
index 929d2cbd878cf927e56af35a982f34d756bbce60..52069b469bdeefed921fbc574d12e9d2490f0e8c 100755 (executable)
--- a/t/t4150-am-subdir.sh
+++ b/t/t4150-am-subdir.sh
@@ -22,14 +22,14 @@ test_expect_success 'am regularly from stdin' '
        git checkout initial &&
        git am <patchfile &&
        git diff master >actual &&
-       diff -u expect actual
+       test_cmp expect actual
 '
 
 test_expect_success 'am regularly from file' '
        git checkout initial &&
        git am patchfile &&
        git diff master >actual &&
-       diff -u expect actual
+       test_cmp expect actual
 '
 
 test_expect_success 'am regularly from stdin in subdirectory' '
@@ -41,7 +41,7 @@ test_expect_success 'am regularly from stdin in subdirectory' '
                git am <../patchfile
        ) &&
        git diff master>actual &&
-       diff -u expect actual
+       test_cmp expect actual
 '
 
 test_expect_success 'am regularly from file in subdirectory' '
@@ -53,7 +53,7 @@ test_expect_success 'am regularly from file in subdirectory' '
                git am ../patchfile
        ) &&
        git diff master >actual &&
-       diff -u expect actual
+       test_cmp expect actual
 '
 
 test_expect_success 'am regularly from file in subdirectory with full path' '
@@ -66,7 +66,7 @@ test_expect_success 'am regularly from file in subdirectory with full path' '
                git am "$P/patchfile"
        ) &&
        git diff master >actual &&
-       diff -u expect actual
+       test_cmp expect actual
 '
 
 test_done