mirror of
https://github.com/danog/code-server.git
synced 2024-12-15 10:47:12 +01:00
8 lines
286 B
Markdown
8 lines
286 B
Markdown
# 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](https://code.visualstudio.com/docs/editor/versioncontrol#_merge-conflicts) to learn about features of this extension.
|