Microsoft/vscode

mirror of https://github.com/microsoft/vscode.git synced 2026-03-01 22:20:21 +00:00

Files

History

Alexandre Schnegg 2678e4b848 Only match exactly 7 equals (fixes #95040 )

2021-02-09 10:35:10 +01:00

..

resources/icons

[ImgBot] Optimize images

2018-11-06 20:46:03 +00:00

Only match exactly 7 equals (fixes #95040 )

2021-02-09 10:35:10 +01:00

.vscodeignore

Do not ship unnecessary files with extensions

2020-07-24 13:57:51 +02:00

extension-browser.webpack.config.js

used shared webpack-config for browser

2020-06-25 23:22:02 +02:00

extension.webpack.config.js

make merge-conflic serverless

2020-06-12 11:03:52 +02:00

package.json

add repository field to extensions package.json

2021-01-29 15:30:45 +01:00

package.nls.json

CodeLens should be one word

2020-04-03 13:46:00 -07:00

README.md

…

tsconfig.json

Update more extensions to use shared config

2018-10-02 10:24:19 -07:00

yarn.lock

Align @types/* dev dependencies (#112718 )

2020-12-18 13:28:39 +01:00

README.md

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.