Merge branch 'dk/send-email-avoid-net-smtp-ssl-when-able' into maint

diff --git a/t/t3203-branch-output.sh b/t/t3203-branch-output.sh
index 5778c0afe12be2495b58a5251fb9bc8dc395a143..a428ae670369505476ab19338bf0f1da70018301 100755 (executable)
--- a/t/t3203-branch-output.sh
+++ b/t/t3203-branch-output.sh
@@ -236,7 +236,7 @@ test_expect_success 'git branch --format option' '
        Refname is refs/heads/ref-to-remote
        EOF
        git branch --format="Refname is %(refname)" >actual &&
-       test_cmp expect actual
+       test_i18ncmp expect actual
 '
 
 test_done