Gix Menu + git-merge-error