- VSCode Version: 1.1.1 - OS Version: OS X Steps to Reproduce: 1. get into a merge conflict 2. Try accepting Git's default message. It's equal to `git commit --no-edit` 3. There is no way to do that!