completion: add missing options for git-merge