Merge branch 'maint'
commit4e4b55dd0f5b4644767265f7c16a8b370278ce56
authorJunio C Hamano <junkio@cox.net>
Tue, 27 Feb 2007 09:33:52 +0000 (27 01:33 -0800)
committerJunio C Hamano <junkio@cox.net>
Tue, 27 Feb 2007 09:33:52 +0000 (27 01:33 -0800)
tree67412de0f549d86f89bf2c05f4c39487a817fb44
parentc260d790c85c07a5f50235f664c36725deedfb10
parent63e50d492c658b4a0d616f57f8b43a7a9ba1bbcc
Merge branch 'maint'

* 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.
builtin-apply.c
builtin-mailinfo.c