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

Doc: Add info about Merge Tool menu item visibility

Browse Source 
Tools > Git > Git Tools > Merge Tool is visible only when
the user has a merge conflict to resolve.

Change-Id: I1c08dae329152726139d075b03a98875b789e154
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
This commit is contained in:
Leena Miettinen
2020-08-20 13:31:15 +02:00
parent e15d457c18
commit 2e0e0df290
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
doc/qtcreator/src/vcs/creator-vcs-git.qdoc
View File

@@ -577,5 +577,6 @@
\uicontrol {Git Tools} > \uicontrol {Git Bash}.
To resolve merge conflicts, select \uicontrol Tools > \uicontrol Git >
\uicontrol {Git Tools} > \uicontrol {Merge Tool}.
\uicontrol {Git Tools} > \uicontrol {Merge Tool}. This menu item is
visible only when you have merge conflicts to resolve.
*/