Merge branch 'sg/prompt-svn-remote-fix' into maint
authorJunio C Hamano <gitster@pobox.com>
Thu, 7 Nov 2013 22:36:45 +0000 (14:36 -0800)
committerJunio C Hamano <gitster@pobox.com>
Thu, 7 Nov 2013 22:36:45 +0000 (14:36 -0800)
Bash prompting code to deal with an SVN remote as an upstream
were coded in a way not supported by older Bash versions (3.x).

* sg/prompt-svn-remote-fix:
bash prompt: don't use '+=' operator in show upstream code path

Trivial merge