Merge branch 'jc/utf8'
commiteff73751bb94b0241fd2204effb8680fe9973cbf
authorJunio C Hamano <junkio@cox.net>
Fri, 29 Dec 2006 03:03:02 +0000 (28 19:03 -0800)
committerJunio C Hamano <junkio@cox.net>
Fri, 29 Dec 2006 03:03:02 +0000 (28 19:03 -0800)
tree5fe6f0f55988d64a7b8b841c62b1c996a3fda5bf
parent013672bc589da395fcba9bf62d699e70f3764689
parent7255ff0446217ad723dad6088504a18f6afb15db
Merge branch 'jc/utf8'

* jc/utf8:
  t3900: test conversion to non UTF-8 as well
  Rename t3900 test vector file
  UTF-8: introduce i18n.logoutputencoding.
  Teach log family --encoding
  i18n.logToUTF8: convert commit log message to UTF-8
  Move encoding conversion routine out of mailinfo to utf8.c

Conflicts:

commit.c
Documentation/config.txt
commit.c