No three-way diff in the new conflict view

[dspyz-matician]

I recently upgraded to the latest version of VS Code and I see it's got this cool new 3-window editor for managing merge/rebase-conflicts. But I find this editor useless because it doesn't show the base revision. Instead the third window is used for some sort of suggested merge which I don't trust. I have no way to no what changes are being merged, only what the code looks like in each (which may be large and unparseable). The old inline style worked smoothly with

[merge]
        conflictstyle = diff3

whereas the new editor does not.

Please include another window showing the base revision

[hediet]

/duplicate #155277

suggested merge which I don't trust.

With the next release next week, the result is just the output that git produced.

[vscodenpa]

Thanks for creating this issue! We figured it's covering the same as another one we already have. Thus, we closed this one as a duplicate. You can search for similar existing issues. See also our issue reporting guidelines.

Happy Coding!