Merge branch 'cb/merge-recursive-fix'

diff --git a/t/t7002-grep.sh b/t/t7002-grep.sh
index 5e359cb561b6d6f7c1bae678b7b823ed2ce34cf1..18fe6f2d576d35706b1a712292b58155680cc9dc 100755 (executable)
--- a/t/t7002-grep.sh
+++ b/t/t7002-grep.sh
@@ -109,7 +109,7 @@ do
        '
 
        test_expect_success "grep -c $L (no /dev/null)" '
-               ! git grep -c test $H | grep -q /dev/null
+               ! git grep -c test $H | grep /dev/null
         '
 
 done