diff options
| -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. */ |