development/vscode
development/vscode
1
0
Fork 0
mirror of https://github.com/Microsoft/vscode synced 2024-10-31 11:34:45 +00:00
Code Issues Projects Releases Packages Wiki Activity
vscode/extensions/merge-conflict/README.md

286 B
Raw Blame History

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.