]> git.ipfire.org Git - thirdparty/git.git/blobdiff - t/t6425-merge-rename-delete.sh
tests: teach callers of test_i18ngrep to use test_grep
[thirdparty/git.git] / t / t6425-merge-rename-delete.sh
index 93cd2869b12897b5246a3a977f0cdaf1b2911663..b95b064311b6762da86c6239a93651edd9dede78 100755 (executable)
@@ -21,8 +21,8 @@ test_expect_success 'rename/delete' '
        git commit -m "delete" &&
 
        test_must_fail git merge --strategy=recursive rename >output &&
-       test_i18ngrep "CONFLICT (rename/delete): A.* renamed .*to B.* in rename" output &&
-       test_i18ngrep "CONFLICT (rename/delete): A.*deleted in HEAD." output
+       test_grep "CONFLICT (rename/delete): A.* renamed .*to B.* in rename" output &&
+       test_grep "CONFLICT (rename/delete): A.*deleted in HEAD." output
 '
 
 test_done