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)
commit15b8e94aee06f004da178bc0bfaabd50a0fda242
tree60f8ba1f2f7b9081484eb386efbb73c6096de812
parent32f2f11f39bf8fe0cfebdfbc36cc2476507d5f1c
parenta15080e5f43d840717f8e3b68410f26c8cd54db2
Merge branch 'jc/maint-apply-fix'

* jc/maint-apply-fix:
  builtin-apply.c: do not set bogus mode in check_preimage() for deleted path
builtin-apply.c