From 9e781a1b1958b9979eae7e60a255504255662229 Mon Sep 17 00:00:00 2001
From: Leena Miettinen <riitta-leena.miettinen@qt.io>
Date: Thu, 11 Oct 2018 10:12:52 +0200
Subject: [PATCH] Doc: Describe configuring merge tools

Qt Creator only supports graphical merge tools

Change-Id: I282613a03ba2ff91e82b4bafe5d95164495231f8
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
---
 doc/src/vcs/creator-vcs-git.qdoc | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/doc/src/vcs/creator-vcs-git.qdoc b/doc/src/vcs/creator-vcs-git.qdoc
index f5cd4a2e922..54d58e96710 100644
--- a/doc/src/vcs/creator-vcs-git.qdoc
+++ b/doc/src/vcs/creator-vcs-git.qdoc
@@ -281,6 +281,17 @@
             \li Set the current branch to track the selected one.
     \endtable
 
+    \section3 Configuring Merge Tools
+
+    Only graphical merge tools are supported. You can configure the
+    merge tool to use on the command line. For example, to use the
+    \l{http://kdiff3.sourceforge.net/}{KDiff3} merge tool, enter the
+    following command:
+
+    \badcode
+    git config --global merge.tool kdiff3
+    \endcode
+
     \section2 Applying Patches
 
     Patches are rewriting instructions that can be applied to a set of files.