diff options
| author | Leena Miettinen <riitta-leena.miettinen@qt.io> | 2020-08-20 13:31:15 +0200 |
|---|---|---|
| committer | Leena Miettinen <riitta-leena.miettinen@qt.io> | 2020-08-20 13:29:31 +0000 |
| commit | 2e0e0df290410ad2aaceb2d1aaa205d35600bd85 (patch) | |
| tree | 5fc331a3cf768328291ebeccb6453a10e20bc4cb | |
| parent | e15d457c18cd28de3e187d2557a58a966438d9bd (diff) | |
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 <orgads@gmail.com>
| -rw-r--r-- | doc/qtcreator/src/vcs/creator-vcs-git.qdoc | 3 |
1 files changed, 2 insertions, 1 deletions
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. */ |