From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 23 Jul 2009 04:56:46 +0000 (-0700)
Subject: Merge branch 'maint'
X-Git-Tag: v1.6.4-rc2~9
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=248b6c0609cf7cc9411a9094c4868ce9cdbd4922;p=git.git

Merge branch 'maint'

* maint:
  Trailing whitespace and no newline fix
  diff --cc: a lost line at the beginning of the file is shown incorrectly
  combine-diff.c: fix performance problem when folding common deleted lines
---

248b6c0609cf7cc9411a9094c4868ce9cdbd4922