Merge branch 'jk/strbuf-detach-always-non-null'

diff --git a/t/t4202-log.sh b/t/t4202-log.sh
index b3ac6be3b0d2cc47af4559bcf7401ef858dae322..924ba536ca9718da0f4126d53c316a5f7a1926a5 100755 (executable)
--- a/t/t4202-log.sh
+++ b/t/t4202-log.sh
@@ -813,7 +813,7 @@ sanitize_output () {
 test_expect_success 'log --graph with diff and stats' '
        git log --graph --pretty=short --stat -p >actual &&
        sanitize_output >actual.sanitized <actual &&
-       test_cmp expect actual.sanitized
+       test_i18ncmp expect actual.sanitized
 '
 
 test_expect_success 'dotdot is a parent directory' '