Merge branch 'maint-1.6.0' into maint-1.6.1

diff --git a/t/t4150-am.sh b/t/t4150-am.sh
index 1be5fb3f9dfab6d4fcd79f65de6b85ae05f373cd..796f795267dee1eaf63b10fb3e5e14ce0431bebd 100755 (executable)
--- a/t/t4150-am.sh
+++ b/t/t4150-am.sh
@@ -165,7 +165,7 @@ test_expect_success 'am --keep really keeps the subject' '
        git am --keep patch4 &&
        ! test -d .git/rebase-apply &&
        git cat-file commit HEAD |
-               grep -q -F "Re: Re: Re: [PATCH 1/5 v2] third"
+               fgrep "Re: Re: Re: [PATCH 1/5 v2] third"
 '
 
 test_expect_success 'am -3 falls back to 3-way merge' '