mirror of https://github.com/microsoft/vscode.git synced 2026-05-08 09:08:48 +01:00

Files

T

Matt Bierner 75a0ad4f75 Esbuild a few more built-in extensions

Switches from webpack to esbuild for `merge-conflict`, `references-view`,  `search-result`, and `simple-browser`

2026-02-13 15:00:06 -08:00

…

…

.npmrc

…

.vscodeignore

2026-02-13 15:00:06 -08:00

esbuild.browser.mts

2026-02-13 15:00:06 -08:00

esbuild.mts

2026-02-13 15:00:06 -08:00

package-lock.json

2026-02-13 04:15:03 +05:00

package.json

2026-02-13 15:00:06 -08:00

package.nls.json

…

README.md

…

tsconfig.browser.json

2026-02-13 15:00:06 -08:00

tsconfig.json

Update roots

2026-01-30 13:12:58 -08: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.