Merge branch 'fc/untracked-zsh-prompt' into maint
authorJunio C Hamano <gitster@pobox.com>
Fri, 26 Apr 2013 18:12:30 +0000 (11:12 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 26 Apr 2013 18:12:30 +0000 (11:12 -0700)
* fc/untracked-zsh-prompt:
prompt: fix untracked files for zsh

1  2 
contrib/completion/git-prompt.sh
Simple merge