Merge branch 'jc/apply'
authorJunio C Hamano <junkio@cox.net>
Fri, 19 May 2006 23:59:29 +0000 (16:59 -0700)
committerJunio C Hamano <junkio@cox.net>
Fri, 19 May 2006 23:59:29 +0000 (16:59 -0700)
* jc/apply:
  apply --cached: do not check newly added file in the working tree


Trivial merge