code-server/lib/vscode/extensions/merge-conflict/README.md

8 lines
286 B
Markdown
Raw Normal View 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](https://code.visualstudio.com/docs/editor/versioncontrol#_merge-conflicts) to learn about features of this extension.