Opening the Merge Editor from Files with Conflicts: A file with a conflict will now automatically show an "Open in Merge Editor" button to transition between the text and merge editors. Merge Editor ...

Merge Editor File Not Modified on Open: "VS Code no longer modifies the result file when opening it in the merge editor (conflicting regions were replaced with base). Instead, the conflict markers ...