tests: teach callers of test_i18ngrep to use test_grep

[thirdparty/git.git] / t / t6430-merge-recursive.sh

diff --git a/t/t6430-merge-recursive.sh b/t/t6430-merge-recursive.sh
index 07067bb347955b146b9654b353e9db2b8b2cd323..ca15e6dd6da94bc1bac8286e9e36a196cde7a797 100755 (executable)
--- a/t/t6430-merge-recursive.sh
+++ b/t/t6430-merge-recursive.sh
@@ -308,13 +308,13 @@ test_expect_success 'fail if the index has unresolved entries' '
 
        test_must_fail git merge "$c5" &&
        test_must_fail git merge "$c5" 2> out &&
-       test_i18ngrep "not possible because you have unmerged files" out &&
+       test_grep "not possible because you have unmerged files" out &&
        git add -u &&
        test_must_fail git merge "$c5" 2> out &&
-       test_i18ngrep "You have not concluded your merge" out &&
+       test_grep "You have not concluded your merge" out &&
        rm -f .git/MERGE_HEAD &&
        test_must_fail git merge "$c5" 2> out &&
-       test_i18ngrep "Your local changes to the following files would be overwritten by merge:" out
+       test_grep "Your local changes to the following files would be overwritten by merge:" out
 '
 
 test_expect_success 'merge-recursive remove conflict' '
@@ -713,7 +713,7 @@ test_expect_success 'merge-recursive remembers the names of all base trees' '
        test_must_fail git -c merge.verbosity=5 merge-recursive $(cat trees) -- $c1 $c3 >out &&
 
        # ...but make sure it fails in the expected way
-       test_i18ngrep CONFLICT.*rename/rename out &&
+       test_grep CONFLICT.*rename/rename out &&
 
        # merge-recursive prints in reverse order, but we do not care
        sort <trees >expect &&