As I understand, you need to disable git.mergeEditor in your user settings:
https://dev.to/vscodetips/vs-code-tip-of-the-week-3-way-merge-editor-416h
As I understand, you need to disable git.mergeEditor in your user settings:
https://dev.to/vscodetips/vs-code-tip-of-the-week-3-way-merge-editor-416h