zsh: add better vcs merge prompt