diff options
| author | Junio C Hamano <junkio@cox.net> | 2006-12-28 19:03:02 -0800 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-12-28 19:03:02 -0800 |
| commit | eff73751bb94b0241fd2204effb8680fe9973cbf (patch) | |
| tree | 5fe6f0f55988d64a7b8b841c62b1c996a3fda5bf /merge-recursive.c | |
| parent | 013672bc589da395fcba9bf62d699e70f3764689 (diff) | |
| parent | 7255ff0446217ad723dad6088504a18f6afb15db (diff) | |
| download | git-eff73751bb94b0241fd2204effb8680fe9973cbf.tar.gz | |
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
Diffstat (limited to 'merge-recursive.c')
0 files changed, 0 insertions, 0 deletions