From ab7f6e871d1af714ae454a06e2745a6ec0521704 Mon Sep 17 00:00:00 2001
From: Christof Marti <chrmarti@microsoft.com>
Date: Fri, 2 Mar 2018 11:18:31 +0100
Subject: [PATCH] Add link to documentation (#43978)

---
 extensions/merge-conflict/README.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/extensions/merge-conflict/README.md b/extensions/merge-conflict/README.md
index 4bbc7ba828364..a2f874bcb42ae 100644
--- a/extensions/merge-conflict/README.md
+++ b/extensions/merge-conflict/README.md
@@ -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.