Merge branch 'am/completion-zsh-fix'
commitf47ff5afe4208488c6f977b497b81acdce941afc
authorJunio C Hamano <gitster@pobox.com>
Fri, 23 Mar 2012 21:36:21 +0000 (23 14:36 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 23 Mar 2012 21:36:21 +0000 (23 14:36 -0700)
tree1be2e221ac4d28d403dec9c75044e56508ef46f1
parent0df81d860eec53299a43fb8e205caa3cbd813da5
parent471dcfdbb23ad423168d928335bc36217f9e311d
Merge branch 'am/completion-zsh-fix'

* am/completion-zsh-fix:
  contrib/completion: "local var=()" is misinterpreted as func-decl by zsh
contrib/completion/git-completion.bash