aboutsummaryrefslogtreecommitdiff
path: root/merge-recursive.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2009-01-13 00:56:40 -0800
committerJunio C Hamano <gitster@pobox.com>2009-01-13 00:56:40 -0800
commitae5a97fdd0c553926aabdf324b6d9108b0699bee (patch)
tree4e757fbe32df5eb3cc5cb437634aa7ac2831e4be /merge-recursive.c
parent1cbe69f649fc45a3052e82c8e92e4a0f9eff67ed (diff)
parent1f7903a371f90f025cfc3b4aa3a0b4a8f8b05b94 (diff)
downloadgit-ae5a97fdd0c553926aabdf324b6d9108b0699bee.tar.gz
git-ae5a97fdd0c553926aabdf324b6d9108b0699bee.tar.xz
Merge branch 'ap/maint-apply-modefix' into maint
* ap/maint-apply-modefix: builtin-apply: prevent non-explicit permission changes
Diffstat (limited to 'merge-recursive.c')
0 files changed, 0 insertions, 0 deletions