git-resolve: dying is good, not showing help is bad.