vscode/extensions/merge-conflict/README.md

# 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.
Name, description, icon for merge-conflict extension (#43978) 2018-02-26 08:48:26 +00:00			`# Merge Conflict`

Edit pass on new built-in extension comments (#54277) 2018-07-13 22:28:27 +00:00			`Notice: This extension is bundled with Visual Studio Code. It can be disabled but not uninstalled.`
Add link to documentation (#43978) 2018-03-02 10:18:31 +00:00
Standardize readme across built-in extensions #54098 2018-07-11 23:38:12 +00:00			`## Features`

Edit pass on new built-in extension comments (#54277) 2018-07-13 22:28:27 +00:00			`See [Merge Conflicts in VS Code](https://code.visualstudio.com/docs/editor/versioncontrol#_merge-conflicts) to learn about features of this extension.`