Merge git://git.kernel.org/pub/scm/gitk/gitk

diff --git a/t/t3900-i18n-commit.sh b/t/t3900-i18n-commit.sh
index fcbabe8ec32d61888e6cb28d393381066d1b0f3c..883281dbd6c02ea7b2d90336c2629eafacee0257 100755 (executable)
--- a/t/t3900-i18n-commit.sh
+++ b/t/t3900-i18n-commit.sh
@@ -8,8 +8,8 @@ test_description='commit and log output encodings'
 . ./test-lib.sh
 
 compare_with () {
-       git show -s $1 | sed -e '1,/^$/d' -e 's/^    //' -e '$d' >current &&
-       git diff current "$2"
+       git show -s $1 | sed -e '1,/^$/d' -e 's/^    //' >current &&
+       test_cmp current "$2"
 }
 
 test_expect_success setup '