summaryrefslogtreecommitdiff
path: root/t/t3507-cherry-pick-conflict.sh
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2013-08-30 10:10:55 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2013-08-30 10:10:55 -0700
commitf2be2a51f2bb168042fcacf7476736da25571ead (patch)
treef745a34974968399e9024dd567a2963e74431923 /t/t3507-cherry-pick-conflict.sh
parentMerge branch 'sp/doc-smart-http' (diff)
parentcontrib/git-prompt.sh: handle missing 'printf -v' more gracefully (diff)
downloadtgif-f2be2a51f2bb168042fcacf7476736da25571ead.tar.xz
Merge branch 'bc/completion-for-bash-3.0'
Some people still use rather old versions of bash, which cannot grok some constructs like 'printf -v varname' the prompt and completion code started to use recently. * bc/completion-for-bash-3.0: contrib/git-prompt.sh: handle missing 'printf -v' more gracefully t9902-completion.sh: old Bash still does not support array+=('') notation git-completion.bash: use correct Bash/Zsh array length syntax
Diffstat (limited to 't/t3507-cherry-pick-conflict.sh')
0 files changed, 0 insertions, 0 deletions