]> rtime.felk.cvut.cz Git - git.git/commitdiff
Merge branch 'jc/maint-apply-fix' into maint
authorJunio C Hamano <gitster@pobox.com>
Fri, 6 Feb 2009 02:06:11 +0000 (18:06 -0800)
committerJunio C Hamano <gitster@pobox.com>
Fri, 6 Feb 2009 02:06:11 +0000 (18:06 -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