Merge tag 'gitgui-0.17.0' of git://repo.or.cz/git-gui

diff --git a/t/t4200-rerere.sh b/t/t4200-rerere.sh
index 3ab670d36aea890e07827b14486e4c49de83bdb5..7f6666fcd3ffd6dfe53ed72cedcbabfe5a626ed8 100755 (executable)
--- a/t/t4200-rerere.sh
+++ b/t/t4200-rerere.sh
@@ -382,13 +382,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 &&
-       grep [Uu]sage err &&
+       test_i18ngrep [Uu]sage err &&
        test_must_fail git update-index --refresh
 '
 
 test_expect_success 'rerere -h' '
        test_must_fail git rerere -h >help &&
-       grep [Uu]sage help
+       test_i18ngrep [Uu]sage help
 '
 
 test_done