Merge branch 'lt/apply' into next
authorJunio C Hamano <junkio@cox.net>
Wed, 1 Mar 2006 09:35:00 +0000 (01:35 -0800)
committerJunio C Hamano <junkio@cox.net>
Wed, 1 Mar 2006 09:35:00 +0000 (01:35 -0800)
* lt/apply:
  git-am: --whitespace=x option.


Trivial merge