Merge branch 'jk/test-lib-drop-pid-from-results' into maint

diff --git a/t/t3400-rebase.sh b/t/t3400-rebase.sh
index 47b5682662a6ed2e6734f9f9f101a5ddabcc22ff..f5fd15e55994bafc0f0a2c91b0d00455df13d18d 100755 (executable)
--- a/t/t3400-rebase.sh
+++ b/t/t3400-rebase.sh
@@ -136,8 +136,8 @@ test_expect_success 'setup: recover' '
 test_expect_success 'Show verbose error when HEAD could not be detached' '
        >B &&
        test_must_fail git rebase topic 2>output.err >output.out &&
-       grep "The following untracked working tree files would be overwritten by checkout:" output.err &&
-       grep B output.err
+       test_i18ngrep "The following untracked working tree files would be overwritten by checkout:" output.err &&
+       test_i18ngrep B output.err
 '
 rm -f B