Bug in completion for git merge

[Thomas Becker <twbecker@xxxxxxxxx>]

There seems to be a bug in the completion for git merge; the completion function uses the following statement to both declare and initialize an array, which from what I can tell is not allowed:

local -a git_commit_opts=(--all --not HEAD --not)

I traced the addition of this to the following patch:

http://www.zsh.org/mla/workers//2015/msg02947.html

The code as written results in the following when invoking tab completion on git merge:

arda:~/.dotfiles $ git merge
_git-merge:3: number expected
_git-merge:3: number expected
_git-merge:3: number expected