mirror of
https://github.com/Microsoft/vscode
synced 2024-10-31 01:12:58 +00:00
7 lines
286 B
Markdown
7 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.
|