git-gui: Simplify error case for unsupported merge types