mirror of
https://github.com/microsoft/vscode.git
synced 2026-04-17 15:24:40 +01:00
75a0ad4f75
Switches from webpack to esbuild for `merge-conflict`, `references-view`, `search-result`, and `simple-browser`
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.