Merge branch 'master' of git://repo.or.cz/git-gui

diff --git a/t/t4104-apply-boundary.sh b/t/t4104-apply-boundary.sh
index 2ff800c23f8f833393c9eb7f50c89bd1a790094f..64f34e329867cbef3c122c96a63cfd844b0953af 100755 (executable)
--- a/t/t4104-apply-boundary.sh
+++ b/t/t4104-apply-boundary.sh
@@ -3,7 +3,7 @@
 # Copyright (c) 2005 Junio C Hamano
 #
 
-test_description='git-apply boundary tests
+test_description='git apply boundary tests
 
 '
 . ./test-lib.sh
@@ -90,7 +90,7 @@ do
                                cat '"$kind-patch.$with"'
                                (exit 1)
                        } &&
-                       diff -u '"$kind"'-expect victim
+                       git diff '"$kind"'-expect victim
                '
        done
 done
@@ -108,7 +108,7 @@ do
                        cat '"$kind-ng.without"'
                        (exit 1)
                } &&
-               diff -u '"$kind"'-expect victim
+               git diff '"$kind"'-expect victim
        '
 done