tree 4325c3d15466bdd00834b97ce005c29d525e4e3c
parent 7b261711a65154c2e3bc52a24bdc391085a1c17e
parent a15080e5f43d840717f8e3b68410f26c8cd54db2
author Junio C Hamano <gitster@pobox.com> 1233885971 -0800
committer Junio C Hamano <gitster@pobox.com> 1233885971 -0800

Merge branch 'jc/maint-apply-fix' into maint

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