vscode/extensions/merge-conflict
Logan Ramos e689b912ba
Update telemetry package (#236378)
2024-12-17 20:12:49 +01:00
..
media
src
.npmrc
.vscodeignore
README.md
extension-browser.webpack.config.js
extension.webpack.config.js
package-lock.json
package.json
package.nls.json
tsconfig.json

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.