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 ...

In last month's update, the team announced he new ability for devs to use command-line options to bring up the merge editor in the code editor, enabling them, for example, to set some configurations ...