History

Logan Ramos e689b912ba Update telemetry package (#236378 )		2024-12-17 20:12:49 +01:00
..
media	Add icons for built-in extensions (fixes #81760 )	2021-04-20 12:09:24 -07:00
src	Fixes flashing of inline conflict marker code lenses (#168598 )	2022-12-09 15:16:55 +01:00
.npmrc	chore: add npmrc to extensions folder (#230214 )	2024-10-01 12:43:01 +02:00
.vscodeignore	chore: rm unreached ignore items when build extensions. (#227906 )	2024-09-09 10:32:51 +00:00
README.md	…
extension-browser.webpack.config.js	used shared webpack-config for browser	2020-06-25 23:22:02 +02:00
extension.webpack.config.js	…
package-lock.json	Update telemetry package (#236378 )	2024-12-17 20:12:49 +01:00
package.json	Update telemetry package (#236378 )	2024-12-17 20:12:49 +01: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

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.