From: Junio C Hamano <junkio@cox.net>
Date: Fri, 29 Dec 2006 03:03:02 +0000 (-0800)
Subject: Merge branch 'jc/utf8'
X-Git-Tag: v1.5.0-rc1~158
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=eff73751bb94b0241fd2204effb8680fe9973cbf;p=git.git

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
---

eff73751bb94b0241fd2204effb8680fe9973cbf
diff --cc commit.c
index 59ea77c57,6f2839a5c..eb06afbbe
--- a/commit.c
+++ b/commit.c
@@@ -1,7 -1,7 +1,8 @@@
  #include "cache.h"
  #include "tag.h"
  #include "commit.h"
 +#include "pkt-line.h"
+ #include "utf8.h"
  
  int save_commit_buffer = 1;