Merge branch 'jc/whitespace'
commitf2ce6a4c3c9dba3b2366e4c48bb7f417a2cb7fb8
authorJunio C Hamano <junkio@cox.net>
Thu, 28 Sep 2006 04:50:42 +0000 (27 21:50 -0700)
committerJunio C Hamano <junkio@cox.net>
Thu, 28 Sep 2006 04:50:42 +0000 (27 21:50 -0700)
treee625b44d46e2192721d6fa553dfce833dabd6386
parent1ad7a06adb6fbe42357daa58738008cbadbb8650
parentd0c25035df4897bb58422b4d64f00b54cf11f07e
Merge branch 'jc/whitespace'

* jc/whitespace:
  git-apply: second war on whitespace.
  diff.c: second war on whitespace.