From 5338a6a924b9519dfbd3c92142f83d6ecf925097 Mon Sep 17 00:00:00 2001 From: David Aguilar Date: Sun, 27 Jan 2013 16:52:24 -0800 Subject: 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 Signed-off-by: Junio C Hamano --- git-mergetool--lib.sh | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) 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 -- cgit v1.2.3