Include Actual 3-way Merging in the 3-way Merge Editor

[enjibby]

I have long-used git config --global merge.conflictStyle diff3 as an excellent way to see the "motivation" behind each side of a conflict. This includes a copy of the original code before either of the changes were made to make the changes more obvious.

When the new Git Merge Editor was unexpectedly turned on by default, I lost the ability to see this "parent of..." section until I eventually found a way to return to the old conflict resolution view that I had grown to rely on.

If git is set to merge.conflictStyle diff3 and an additional setting in vscode is enabled, could we please have either:

1. some sort of highlighting that shows us how each side of the merge differs from the "parent of..." instead of each other?
2. a 4th pane showing the "parent of..." view?

[yume-chan]

Duplicate of #155277

[gjsjohnmurray]

/duplicate - thanks @yume-chan

[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!