]> git.ipfire.org Git - thirdparty/git.git/commitdiff
Merge branch 'jk/utf-8-can-be-spelled-differently' into maint
authorJunio C Hamano <gitster@pobox.com>
Tue, 26 Mar 2013 19:43:25 +0000 (12:43 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 26 Mar 2013 19:43:25 +0000 (12:43 -0700)
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

1  2 
utf8.c

diff --cc utf8.c
Simple merge