Merge branch 'ph/pull-rebase-detached' into maint

diff --git a/t/t1502-rev-parse-parseopt.sh b/t/t1502-rev-parse-parseopt.sh
index 1efd7f76ddea8dbd788032c5a9076270d1159825..13c88c9aae7f7177cbff278cf5e587f86acb11e7 100755 (executable)
--- a/t/t1502-rev-parse-parseopt.sh
+++ b/t/t1502-rev-parse-parseopt.sh
@@ -41,7 +41,7 @@ EOF
 
 test_expect_success 'test --parseopt help output' '
        test_expect_code 129 git rev-parse --parseopt -- -h > output < optionspec &&
-       test_cmp expect output
+       test_i18ncmp expect output
 '
 
 cat > expect <<EOF