1
0
mirror of https://github.com/coder/code-server.git synced 2024-12-05 07:13:06 +08:00
code-server/lib/vscode/extensions/merge-conflict/README.md

286 B

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.