maxmustermann/vscode
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity
vscode/extensions/merge-conflict
History
Alex Dima 34e7a220c8 Avoid shipping unnecessary files
2018-09-19 19:53:46 +02:00
..
resources/icons Name, description, icon for merge-conflict extension (#43978) 2018-02-26 09:48:34 +01:00
src Use the fast variant of TextEditor.setDecorations 2018-09-17 17:10:07 +02:00
.vscodeignore Avoid shipping unnecessary files 2018-09-19 19:53:46 +02:00
extension.webpack.config.js webpack merge-conflict #57680 2018-09-19 15:19:51 +02:00
package.json adopt vscode-nls 4.0.0 2018-09-06 14:44:33 +02:00
package.nls.json Settings sweep (#54690) 2018-07-30 12:35:43 +02:00
README.md Edit pass on new built-in extension comments (#54277) 2018-07-13 15:28:27 -07:00
tsconfig.json Add additional no unused checks for merge-conflict extension 2017-11-07 11:22:08 -08:00
yarn.lock adopt vscode-nls 4.0.0 2018-09-06 14:44:33 +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.