Merge branch 'maint'
authorJunio C Hamano <junkio@cox.net>
Sat, 4 Nov 2006 11:54:20 +0000 (03:54 -0800)
committerJunio C Hamano <junkio@cox.net>
Sat, 4 Nov 2006 11:54:20 +0000 (03:54 -0800)
* maint:
  apply: handle "traditional" creation/deletion diff correctly.

1  2 
builtin-apply.c

diff --cc builtin-apply.c
Simple merge