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.
Source: extensions/merge-conflict/README.md
Notice: This extension is bundled with Visual Studio Code. It can be disabled but not uninstalled.