summaryrefslogtreecommitdiff
path: root/merge-recursive.h
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2013-10-17 15:45:57 -0700
committerJunio C Hamano <gitster@pobox.com>2013-10-17 15:45:58 -0700
commitda39d5e0bceaea51851658c0ed3ff0097b00ee0f (patch)
treeb1f83795b8ae2a8dc5edcc9a3914e100b7e1f1df /merge-recursive.h
parentfa0963dac7f67a162bd04ebed29a18412545f481 (diff)
parent1b48d56cfb006baf12d34b5e3150ba2ec1900e08 (diff)
downloadgit-da39d5e0bceaea51851658c0ed3ff0097b00ee0f.tar.gz
Merge branch 'jc/cvsserver-perm-bit-fix' into maint
* jc/cvsserver-perm-bit-fix: cvsserver: pick up the right mode bits
Diffstat (limited to 'merge-recursive.h')
0 files changed, 0 insertions, 0 deletions