Support 3 way merge for git conflicts · Issue #37350 · microsoft/vscode ...

Responsive image
source