danog/code-server
1
0
Fork 0
mirror of https://github.com/danog/code-server.git synced 2024-12-14 02:07:28 +01:00
Code Issues Packages Projects Releases Wiki Activity
44a4a0bc20
code-server/lib/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.