From 2e0e0df290410ad2aaceb2d1aaa205d35600bd85 Mon Sep 17 00:00:00 2001 From: Leena Miettinen Date: Thu, 20 Aug 2020 13:31:15 +0200 Subject: Doc: Add info about Merge Tool menu item visibility 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 --- doc/qtcreator/src/vcs/creator-vcs-git.qdoc | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/doc/qtcreator/src/vcs/creator-vcs-git.qdoc b/doc/qtcreator/src/vcs/creator-vcs-git.qdoc index 4e713553d5..03f05c3ccb 100644 --- a/doc/qtcreator/src/vcs/creator-vcs-git.qdoc +++ b/doc/qtcreator/src/vcs/creator-vcs-git.qdoc @@ -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. */ -- cgit v1.2.3