Merge branch 'ap/maint-apply-modefix' into maint
authorJunio C Hamano <gitster@pobox.com>
Tue, 13 Jan 2009 08:56:40 +0000 (00:56 -0800)
committerJunio C Hamano <gitster@pobox.com>
Tue, 13 Jan 2009 08:56:40 +0000 (00:56 -0800)
* ap/maint-apply-modefix:
  builtin-apply: prevent non-explicit permission changes

1  2 
builtin-apply.c

diff --cc builtin-apply.c
Simple merge