development/vscode
development/vscode
1
0
Fork 0
mirror of https://github.com/Microsoft/vscode synced 2024-10-30 01:37:20 +00:00
Code Issues Projects Releases Packages Wiki Activity
vscode/extensions/merge-conflict
History
Alexandru Dima f74ad9692f
Align @types/* dev dependencies (#112718)
2020-12-18 13:28:39 +01:00
..
resources/icons [ImgBot] Optimize images 2018-11-06 20:46:03 +00:00
src Update to use TS 4.1 for building VS Code 2020-09-16 11:58:01 -07: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 Align @types/* dev dependencies (#112718) 2020-12-18 13:28:39 +01:00
package.nls.json CodeLens should be one word 2020-04-03 13:46:00 -07:00
README.md Edit pass on new built-in extension comments (#54277) 2018-07-13 15:28:27 -07:00
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.