Merge branch 'fc/git-complete-helper' into fc/git-prompt-script

diff --git a/t/t5150-request-pull.sh b/t/t5150-request-pull.sh
index 7c1dc641dec809fe314dcba7a4946154e8422f9b..432f98c357601057cb89f9dd6bfbe1ab02e9477a 100755 (executable)
--- a/t/t5150-request-pull.sh
+++ b/t/t5150-request-pull.sh
@@ -95,7 +95,7 @@ test_expect_success 'setup: two scripts for reading pull requests' '
        b
        : diffstat
        n
-       / [0-9]* files changed/ {
+       / [0-9]* files* changed/ {
                a\\
        DIFFSTAT
                b
@@ -216,7 +216,7 @@ test_expect_success 'pull request format' '
                git request-pull initial "$downstream_url" >../request
        ) &&
        <request sed -nf fuzz.sed >request.fuzzy &&
-       test_cmp expect request.fuzzy
+       test_i18ncmp expect request.fuzzy
 
 '