From: Junio C Hamano <junkio@cox.net>
Date: Tue, 27 Feb 2007 09:33:52 +0000 (-0800)
Subject: Merge branch 'maint'
X-Git-Tag: v1.5.1-rc1~126
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=4e4b55dd0f5b4644767265f7c16a8b370278ce56;p=git.git

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

4e4b55dd0f5b4644767265f7c16a8b370278ce56