From: Junio C Hamano Date: Thu, 21 Mar 2013 21:02:58 +0000 (-0700) Subject: Merge branch 'jk/utf-8-can-be-spelled-differently' X-Git-Tag: v1.8.3-rc0~196 X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/31b12a1999968b54ff3f251d4e939e7ecf662711 Merge branch 'jk/utf-8-can-be-spelled-differently' Some platforms and users spell UTF-8 differently; retry with the most official "UTF-8" when the system does not understand the user-supplied encoding name that are the common alternative spellings of UTF-8. * jk/utf-8-can-be-spelled-differently: utf8: accept alternate spellings of UTF-8 --- 31b12a1999968b54ff3f251d4e939e7ecf662711