mirror of
https://github.com/microsoft/vscode.git
synced 2026-02-15 07:28:05 +00:00
…
Merge Conflict
Notice: This extension is bundled with Visual Studio Code. It can be disabled but not uninstalled.
Features
See Merge Conflicts in VS Code to learn about features of this extension.