mirror of
https://github.com/microsoft/vscode.git
synced 2026-04-25 11:08:51 +01:00
6 lines
190 B
Markdown
6 lines
190 B
Markdown
# Merge Conflict
|
|
|
|
See [documentation](https://code.visualstudio.com/docs/editor/versioncontrol#_merge-conflicts).
|
|
|
|
**Notice** This is a an extension that is bundled with Visual Studio Code.
|