summaryrefslogtreecommitdiff
path: root/git-mergetool--lib.sh
diff options
context:
space:
mode:
authorDavid Aguilar <davvid@gmail.com>2013-01-27 16:52:24 -0800
committerJunio C Hamano <gitster@pobox.com>2013-01-29 14:31:22 -0800
commit5338a6a924b9519dfbd3c92142f83d6ecf925097 (patch)
tree8facb8e8b71cf1e47420a8a6f60da7f045335976 /git-mergetool--lib.sh
parent80ff2b68f28193af70d4c0bb9d363531eb1c3d23 (diff)
downloadgit-5338a6a924b9519dfbd3c92142f83d6ecf925097.tar.gz
mergetool--lib: improve the help text in guess_merge_tool()
This code path is only activated when the user does not have a valid configured tool. Add a message to guide new users towards configuring a default tool. Signed-off-by: David Aguilar <davvid@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'git-mergetool--lib.sh')
-rw-r--r--git-mergetool--lib.sh8
1 files changed, 7 insertions, 1 deletions
diff --git a/git-mergetool--lib.sh b/git-mergetool--lib.sh
index 2a67383081..7edc27f92c 100644
--- a/git-mergetool--lib.sh
+++ b/git-mergetool--lib.sh
@@ -240,7 +240,13 @@ show_tool_help () {
guess_merge_tool () {
list_merge_tool_candidates
- echo >&2 "merge tool candidates: $tools"
+ cat >&2 <<-EOF
+
+ This message is displayed because '$TOOL_MODE.tool' is not configured.
+ See 'git ${TOOL_MODE}tool --tool-help' or 'git help config' for more details.
+ 'git ${TOOL_MODE}tool' will now attempt to use one of the following tools:
+ $tools
+ EOF
# Loop over each candidate and stop when a valid merge tool is found.
for i in $tools