Merge branch 'maint' to synchronize with 1.5.0.6

diff --git a/t/t3900-i18n-commit.sh b/t/t3900-i18n-commit.sh
index e54fe0f4014d435f7d2da325bef3d7602a584d42..ffddb68db3abbf1ab14bf99f3c9514a7ee0c276b 100755 (executable)
--- a/t/t3900-i18n-commit.sh
+++ b/t/t3900-i18n-commit.sh
@@ -9,7 +9,7 @@ test_description='commit and log output encodings'
 
 compare_with () {
        git-show -s $1 | sed -e '1,/^$/d' -e 's/^    //' -e '$d' >current &&
-       diff -u current "$2"
+       git diff current "$2"
 }
 
 test_expect_success setup '