summaryrefslogtreecommitdiff
path: root/t/t4150-am.sh
diff options
context:
space:
mode:
Diffstat (limited to 't/t4150-am.sh')
-rwxr-xr-xt/t4150-am.sh4
1 files changed, 2 insertions, 2 deletions
diff --git a/t/t4150-am.sh b/t/t4150-am.sh
index 6e6aaf5936..796f795267 100755
--- a/t/t4150-am.sh
+++ b/t/t4150-am.sh
@@ -164,8 +164,8 @@ test_expect_success 'am --keep really keeps the subject' '
git checkout HEAD^ &&
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"
+ git cat-file commit HEAD |
+ fgrep "Re: Re: Re: [PATCH 1/5 v2] third"
'
test_expect_success 'am -3 falls back to 3-way merge' '