Merge branch 'jc/maint-apply-fix'
authorJunio C Hamano <gitster@pobox.com>
Sun, 1 Feb 2009 02:08:58 +0000 (18:08 -0800)
committerJunio C Hamano <gitster@pobox.com>
Sun, 1 Feb 2009 02:08:58 +0000 (18:08 -0800)
* jc/maint-apply-fix:
  builtin-apply.c: do not set bogus mode in check_preimage() for deleted path

1  2 
builtin-apply.c

diff --cc builtin-apply.c
Simple merge