summaryrefslogtreecommitdiff
path: root/t/t7602-merge-octopus-many.sh
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2013-07-24 19:22:49 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2013-07-24 19:22:49 -0700
commitf01723aaa1dc6ab676073d27b8d471e29abae208 (patch)
treefab4c67b602958b1f5f23613ffdd67cfee84847c /t/t7602-merge-octopus-many.sh
parentMerge branch 'rj/sparse' (diff)
parentcygwin: stop forcing core.filemode=false (diff)
downloadtgif-f01723aaa1dc6ab676073d27b8d471e29abae208.tar.xz
Merge branch 'ml/cygwin-updates'
The tip one does _not_ revert c869753e (Force core.filemode to false on Cygwin., 2006-12-30) on purpose, so that people can still retain the old behaviour if they wanted to. * ml/cygwin-updates: cygwin: stop forcing core.filemode=false Cygwin 1.7 supports mmap Cygwin 1.7 has thread-safe pread Cygwin 1.7 needs compat/regex
Diffstat (limited to 't/t7602-merge-octopus-many.sh')
0 files changed, 0 insertions, 0 deletions