Merge branch 'maint'

diff --git a/t/t4201-shortlog.sh b/t/t4201-shortlog.sh
index 672b28859f0612ec7eef15765ccdb006beac27e6..405b97119175a1c0fa75a9db30c6b1ab076cc44e 100755 (executable)
--- a/t/t4201-shortlog.sh
+++ b/t/t4201-shortlog.sh
@@ -50,6 +50,6 @@ test_expect_success 'shortlog wrapping' 'test_cmp expect out'
 git log HEAD > log
 GIT_DIR=non-existing git shortlog -w < log > out
 
-test_expect_success 'shortlog from non-git directory' 'diff -u expect out'
+test_expect_success 'shortlog from non-git directory' 'test_cmp expect out'
 
 test_done