From: Junio C Hamano <junkio@cox.net>
Date: Tue, 22 May 2007 06:57:05 +0000 (-0700)
Subject: Merge branch 'mc/ws'
X-Git-Tag: v1.5.3-rc0~208
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=a3342a2f52a5351739577f8773eab2a1db20b651;p=git.git

Merge branch 'mc/ws'

* mc/ws:
  git-apply: Fix removal of new trailing blank lines.
  Teach 'git-apply --whitespace=strip' to remove empty lines at the end of file
---

a3342a2f52a5351739577f8773eab2a1db20b651