Merge branch 'eb/apply' into next
authorJunio C Hamano <junkio@cox.net>
Tue, 11 Apr 2006 02:45:30 +0000 (19:45 -0700)
committerJunio C Hamano <junkio@cox.net>
Tue, 11 Apr 2006 02:45:30 +0000 (19:45 -0700)
* eb/apply:
  Implement limited context matching in git-apply.


Trivial merge