How to disable/turn off 3-way merge editor view in VSCode?

Question

Until recently, in VSCode, handling merge conflicts was simple (to me, at least):

• Accept Current Change,
• Accept Incoming Change,
• Accept Both Changes,
• Compare Changes.

It used to be something like this:

source

However, from v1.70 onwards, it's been updated. See v1.70 release notes

Now, it looks something like this:

source

At this point, I don't like this new view. So, how can I turn it off and change it back to the original one?

Answer 1

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