Merge branch 'rr/zsh-color-prompt'
authorJunio C Hamano <gitster@pobox.com>
Wed, 5 Jun 2013 21:55:10 +0000 (14:55 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 5 Jun 2013 21:55:10 +0000 (14:55 -0700)
Prompt support (in contrib/) for zsh is updated to use colors.

* rr/zsh-color-prompt:
prompt: colorize ZSH prompt
prompt: factor out gitstring coloring logic
prompt: introduce GIT_PS1_STATESEPARATOR

Trivial merge