Add link to documentation (#43978)

This commit is contained in:
Christof Marti 2018-03-02 11:18:31 +01:00
parent ebc410526a
commit ab7f6e871d

View file

@ -1,3 +1,5 @@
# 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.