Merge branch 'maint'

diff --git a/t/t4017-diff-retval.sh b/t/t4017-diff-retval.sh
index d748d45daec54ec3fa4be2229dbafebd879493eb..60dd2014d5ae5d5e9e168b8b60278d90ef93cc53 100755 (executable)
--- a/t/t4017-diff-retval.sh
+++ b/t/t4017-diff-retval.sh
@@ -123,7 +123,7 @@ test_expect_success 'check detects leftover conflict markers' '
                git --no-pager diff --cached --check >test.out
                test $? = 2
        ) &&
-       test "$(grep "conflict marker" test.out | wc -l)" = 3 &&
+       test 3 = $(grep "conflict marker" test.out | wc -l) &&
        git reset --hard
 '