git on Mac OS and precomposed unicode

diff --git a/t/t2020-checkout-detach.sh b/t/t2020-checkout-detach.sh
index 202ca90c3483837fbbae45c6527c4d55c721dca9..81005373d728f09e1a9289048cc721a0300f1cf9 100755 (executable)
--- a/t/t2020-checkout-detach.sh
+++ b/t/t2020-checkout-detach.sh
@@ -126,7 +126,7 @@ test_expect_success 'checkout warns orphaning 1 of 2 commits' '
 '
 
 test_expect_success 'checkout warns orphaning 1 of 2 commits: output' '
-       check_orphan_warning stderr "2 commits"
+       check_orphan_warning stderr "1 commit"
 '
 
 test_expect_success 'checkout does not warn leaving ref tip' '
@@ -159,7 +159,7 @@ test_expect_success 'tracking count is accurate after orphan check' '
        git config branch.child.merge refs/heads/master &&
        git checkout child^ &&
        git checkout child >stdout &&
-       test_cmp expect stdout
+       test_i18ncmp expect stdout
 '
 
 test_done