Merge branch 'tg/maint-zsh-svn-remote-prompt'
commit8cb9b5f787957460e48c7b376f2c219b7130080d
authorJunio C Hamano <gitster@pobox.com>
Wed, 5 Jun 2013 21:56:41 +0000 (5 14:56 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 5 Jun 2013 21:56:41 +0000 (5 14:56 -0700)
tree984e50e11a86608eaae4af8299645280e749309e
parent058a92ad64cfe55190777b7f4ad5f5772f156286
parentd0583da838afbc5e039b9f0cbbb9b1fb3aa1f1ae
Merge branch 'tg/maint-zsh-svn-remote-prompt'

zsh prompt script that borrowed from bash prompt script did not
work due to slight differences in array variable notation between
these two shells.

* tg/maint-zsh-svn-remote-prompt:
  prompt: fix show upstream with svn and zsh
contrib/completion/git-prompt.sh