vscode/extensions/merge-conflict
2018-07-30 12:35:43 +02:00
..
resources/icons
src
.vscodeignore
package.json
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
yarn.lock

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.