summaryrefslogtreecommitdiff
path: root/git-merge-octopus.sh
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2013-12-17 11:46:29 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2013-12-17 11:46:30 -0800
commitaa13132d9068d77af0b1d8e2cfbf93cda4f09226 (patch)
treeeef509cecc130f1ae2e6f3f156fdbf4e6fb7accc /git-merge-octopus.sh
parentMerge branch 'kb/doc-exclude-directory-semantics' (diff)
parentt5000: simplify gzip prerequisite checks (diff)
downloadtgif-aa13132d9068d77af0b1d8e2cfbf93cda4f09226.tar.xz
Merge branch 'jk/t5000-gzip-simplify'
Test fix. * jk/t5000-gzip-simplify: t5000: simplify gzip prerequisite checks
Diffstat (limited to 'git-merge-octopus.sh')
0 files changed, 0 insertions, 0 deletions