Merge branch 'jc/maint-add-p-overlapping-hunks' into maint

diff --git a/t/t3203-branch-output.sh b/t/t3203-branch-output.sh
index 6028748c6cecaedb087c35182de172ca0e93fe08..4ef7d09115678ff97717a5f6a3027a87490dac79 100755 (executable)
--- a/t/t3203-branch-output.sh
+++ b/t/t3203-branch-output.sh
@@ -72,7 +72,7 @@ cat >expect <<'EOF'
   branch-two
   master
 EOF
-test_expect_success 'git branch shows detached HEAD properly' '
+test_expect_success C_LOCALE_OUTPUT 'git branch shows detached HEAD properly' '
        git checkout HEAD^0 &&
        git branch >actual &&
        test_cmp expect actual