summaryrefslogtreecommitdiff
path: root/git-merge-octopus.sh
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2010-09-06 16:46:36 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2010-09-06 16:46:36 -0700
commit347c47e61e5daf1efb3503724a431e4316c6eb5b (patch)
treef5c0c4da1c77b79cfa2831cfa2a55956d7be7528 /git-merge-octopus.sh
parentt3404 & t7508: cd inside subshell instead of around (diff)
parentSeveral tests: cd inside subshell instead of around (diff)
downloadtgif-347c47e61e5daf1efb3503724a431e4316c6eb5b.tar.xz
Merge branch 'jl/maint-fix-test'
* jl/maint-fix-test: Several tests: cd inside subshell instead of around Conflicts: t/t9600-cvsimport.sh
Diffstat (limited to 'git-merge-octopus.sh')
0 files changed, 0 insertions, 0 deletions