vscode/extensions/merge-conflict
2021-11-09 15:53:35 +01:00
..
media Add icons for built-in extensions (fixes #81760) 2021-04-20 12:09:24 -07:00
src use tsconfig.json#include for vscode.d.ts and vscode.proposed.d.ts, enables to remove most ref.d.ts-files 2021-11-09 15:53:35 +01:00
.vscodeignore Do not ship unnecessary files with extensions 2020-07-24 13:57:51 +02:00
extension-browser.webpack.config.js
extension.webpack.config.js
package.json adopt web extensions to webpack 5 2021-07-08 21:41:03 +02:00
package.nls.json
README.md
tsconfig.json use tsconfig.json#include for vscode.d.ts and vscode.proposed.d.ts, enables to remove most ref.d.ts-files 2021-11-09 15:53:35 +01:00
yarn.lock adopt web extensions to webpack 5 2021-07-08 21:41:03 +02:00

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.