mirror of
https://github.com/Microsoft/vscode
synced 2024-08-28 13:29:44 +00:00
286 B
286 B
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.