maxmustermann/vscode
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity
vscode/extensions/merge-conflict
History
Martin Aeschlimann 058e1095b2 fix merge-conflict browser main
2020-06-26 11:14:23 +02:00
..
resources/icons
src make merge-conflic serverless 2020-06-12 11:03:52 +02:00
.vscodeignore
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 fix merge-conflict browser main 2020-06-26 11:14:23 +02:00
package.nls.json CodeLens should be one word 2020-04-03 13:46:00 -07:00
README.md
tsconfig.json
yarn.lock

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.