Code

Merge early parts of jk/cached-textconv
authorJunio C Hamano <gitster@pobox.com>
Fri, 9 Apr 2010 06:31:27 +0000 (23:31 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 9 Apr 2010 06:31:51 +0000 (23:31 -0700)
1  2 
diff.c

diff --cc diff.c
Simple merge