История

Logan Ramos ecb0c80fc1 Bump extension telemetry module (#191237 ) * Bump extension telemetry module * Fix webpack		2023-08-24 12:53:41 -07:00
..
media	…
src	Fixes flashing of inline conflict marker code lenses (#168598 )	2022-12-09 15:16:55 +01:00
.vscodeignore	…
README.md	…
extension-browser.webpack.config.js	…
extension.webpack.config.js	…
package.json	Bump extension telemetry module (#191237 )	2023-08-24 12:53:41 -07:00
package.nls.json	…
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	Bump extension telemetry module (#191237 )	2023-08-24 12:53:41 -07: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.