Skip to content

Commit

Permalink
Add link to documentation (#43978)
Browse files Browse the repository at this point in the history
  • Loading branch information
chrmarti committed Mar 2, 2018
1 parent ebc4105 commit ab7f6e8
Showing 1 changed file with 2 additions and 0 deletions.
2 changes: 2 additions & 0 deletions extensions/merge-conflict/README.md
Original file line number Diff line number Diff line change
@@ -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.

0 comments on commit ab7f6e8

Please sign in to comment.