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)
commit8fcd4218c63d15481d8fbb12c3fddfffa98e1adc
tree48861ca4e26905814119020e41beb0aff6342cab
parent6b32ee2381deb414378a76cae213a4fe633f8fcc
parent474958871394365ee7807d88217c3d75269161a6
Merge branch 'eb/apply' into next

* eb/apply:
  Implement limited context matching in git-apply.