X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=t%2Ft7600-merge.sh;h=e84e822219a45cca3478f50a05756be359b43393;hb=59b2389c324dbbb335bd3375d950433b600eee90;hp=b147a1bd69e96e48d3808028a3775a609471639a;hpb=48e0ad033ffd009df1283858ac70ac53660e2d7c;p=git.git diff --git a/t/t7600-merge.sh b/t/t7600-merge.sh index b147a1bd6..e84e82221 100755 --- a/t/t7600-merge.sh +++ b/t/t7600-merge.sh @@ -498,7 +498,7 @@ test_debug 'git log --graph --decorate --oneline --all' test_expect_success 'in-index merge' ' git reset --hard c0 && git merge --no-ff -s resolve c1 >out && - grep "Wonderful." out && + test_i18ngrep "Wonderful." out && verify_parents $c0 $c1 '