maxmustermann/vscode
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity
vscode/extensions/merge-conflict
History
Martin Aeschlimann 7ebe6a6054
adopt web extensions to webpack 5
2021-07-08 21:41:03 +02:00
..
media Add icons for built-in extensions (fixes #81760) 2021-04-20 12:09:24 -07:00
src Adds code lens on vfs files 2021-04-22 03:29:20 -04: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 adopt web extensions to webpack 5 2021-07-08 21:41:03 +02:00
package.nls.json
README.md
tsconfig.json Use more standard name for shared extension tsconfig 2021-04-12 15:58:38 -07:00
yarn.lock adopt web extensions to webpack 5 2021-07-08 21:41:03 +02: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.