mirror of
https://github.com/microsoft/vscode.git
synced 2026-05-08 17:19:48 +01:00
dfeb3e0050
* don't show `openChange` command for merge editor https://github.com/microsoft/vscode/issues/151125 * disable and not-place the conflicting merge-conflict navigation commands for the merge editor https://github.com/microsoft/vscode/issues/153087 * disable (configurable) merge-conflict featues (code lens, decorations) when git is configured to use merge editor https://github.com/microsoft/vscode/issues/153087