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

* fc/untracked-zsh-prompt:
  prompt: fix untracked files for zsh
contrib/completion/git-prompt.sh