Merge branch 'fc/untracked-zsh-prompt'
commit741917f40ce180d0f252a46e7a204cf19eb08289
authorJunio C Hamano <gitster@pobox.com>
Tue, 23 Apr 2013 18:16:58 +0000 (23 11:16 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 23 Apr 2013 18:16:58 +0000 (23 11:16 -0700)
tree687a20ef50a723df81e8b2c79aa33bb0042cb5c3
parentf87f7424df3e3fba0b0211c9a7fe78fe1e526802
parent24b6132e571bf2e27536d42022f8c0733034d880
Merge branch 'fc/untracked-zsh-prompt'

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