]> git.ipfire.org Git - thirdparty/git.git/blobdiff - t/t4200-rerere.sh
Merge branch 'mr/rerere-crash-fix'
[thirdparty/git.git] / t / t4200-rerere.sh
index 10b6d9b0ba5def36361e8b761ccf71499825933e..b0a3e84984185d3e88756bbdb98cb9a56a2233eb 100755 (executable)
@@ -433,13 +433,13 @@ test_expect_success 'rerere --no-no-rerere-autoupdate' '
        git update-index --index-info <failedmerge &&
        cp file3.conflict file3 &&
        test_must_fail git rerere --no-no-rerere-autoupdate 2>err &&
-       test_i18ngrep [Uu]sage err &&
+       test_grep [Uu]sage err &&
        test_must_fail git update-index --refresh
 '
 
 test_expect_success 'rerere -h' '
        test_must_fail git rerere -h >help &&
-       test_i18ngrep [Uu]sage help
+       test_grep [Uu]sage help
 '
 
 concat_insert () {