Merge branch 'maint'

diff --git a/t/t3900-i18n-commit.sh b/t/t3900-i18n-commit.sh
index 5dbbcb63454ec2396341c86f7047994e99ac8d20..b4ec2b53de2662a5ba40602d4b7a4fde984c4013 100755 (executable)
--- a/t/t3900-i18n-commit.sh
+++ b/t/t3900-i18n-commit.sh
@@ -13,8 +13,8 @@ compare_with () {
        '')
                test_cmp "$2" current ;;
        ?*)
-               iconv -f "$3" -t utf8 >current.utf8 <current &&
-               iconv -f "$3" -t utf8 >expect.utf8 <"$2" &&
+               iconv -f "$3" -t UTF-8 >current.utf8 <current &&
+               iconv -f "$3" -t UTF-8 >expect.utf8 <"$2" &&
                test_cmp expect.utf8 current.utf8
                ;;
        esac