Merge branch 'lt/apply' into next
authorJunio C Hamano <junkio@cox.net>
Wed, 24 May 2006 21:11:08 +0000 (14:11 -0700)
committerJunio C Hamano <junkio@cox.net>
Wed, 24 May 2006 21:11:08 +0000 (14:11 -0700)
commit63bccad38a754a1f1387a7dfe6703b27a44279cc
tree85de2c3de40068e6876900a909276a4b78be93ec
parentf54c76f1616cf470ce4bce8eff749272e1c6548c
parent4868f3729acce2aa9512ded7179a895cc50f64c8
Merge branch 'lt/apply' into next

* lt/apply:
  Clean up sha1 file writing
  Builtin git-cat-file
  apply: force matching at the beginning.
  Add a test-case for git-apply trying to add an ending line
  apply: treat EOF as proper context.
Makefile
builtin-apply.c