vscode/extensions/merge-conflict
..
media
src
.vscodeignore
extension-browser.webpack.config.js
extension.webpack.config.js
package.json
package.nls.json
README.md
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.