Merge branch 'jc/whitespace'
authorJunio C Hamano <junkio@cox.net>
Thu, 28 Sep 2006 04:50:42 +0000 (21:50 -0700)
committerJunio C Hamano <junkio@cox.net>
Thu, 28 Sep 2006 04:50:42 +0000 (21:50 -0700)
* jc/whitespace:
git-apply: second war on whitespace.
diff.c: second war on whitespace.

Trivial merge