Merge branch 'mc/ws'
authorJunio C Hamano <junkio@cox.net>
Tue, 22 May 2007 06:57:05 +0000 (23:57 -0700)
committerJunio C Hamano <junkio@cox.net>
Tue, 22 May 2007 06:57:05 +0000 (23:57 -0700)
* 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

Trivial merge