Merge branch 'maint'
commita622f6b35eb72b0ce738c03d6b49f760501bce78
authorJunio C Hamano <junkio@cox.net>
Sat, 4 Nov 2006 11:54:20 +0000 (4 03:54 -0800)
committerJunio C Hamano <junkio@cox.net>
Sat, 4 Nov 2006 11:54:20 +0000 (4 03:54 -0800)
tree9508a491cacb3a06092b694f83e58a2c9c163287
parent6768d6b8477db41a1cfdbd1d81ac8c5131c58e1d
parent6f9f3b263b1c86889d6fae0d50c75be0f3227003
Merge branch 'maint'

* maint:
  apply: handle "traditional" creation/deletion diff correctly.
builtin-apply.c