Code

Merge branch 'maint'
authorJunio C Hamano <junkio@cox.net>
Tue, 27 Feb 2007 09:33:52 +0000 (01:33 -0800)
committerJunio C Hamano <junkio@cox.net>
Tue, 27 Feb 2007 09:33:52 +0000 (01:33 -0800)
* maint:
  git-apply: do not fix whitespaces on context lines.
  diff --cc: integer overflow given a 2GB-or-larger file
  mailinfo: do not get confused with logical lines that are too long.

1  2 
builtin-apply.c
builtin-mailinfo.c

diff --cc builtin-apply.c
Simple merge
Simple merge