feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Doc: Describe configuring merge tools

Browse Source 
Qt Creator only supports graphical merge tools

Change-Id: I282613a03ba2ff91e82b4bafe5d95164495231f8
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
This commit is contained in:
Leena Miettinen
2018-10-11 10:12:52 +02:00
parent d8768c0c6d
commit 9e781a1b19
1 changed files with 11 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
doc/src/vcs/creator-vcs-git.qdoc
View File

@@ -281,6 +281,17 @@
\li Set the current branch to track the selected one. \li Set the current branch to track the selected one.
\endtable \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 \section2 Applying Patches
Patches are rewriting instructions that can be applied to a set of files. Patches are rewriting instructions that can be applied to a set of files.