[PATCH 2/4] mergetool--lib: Improve the help text in guess_merge_tool()

From: David Aguilar <davvid@gmail.com>
Date: Jan 27, 2013, 21:24 UTC
Message-ID: <1359321886-80523-3-git-send-email-davvid@gmail.com>
In-Reply-To: <1359321886-80523-1-git-send-email-davvid@gmail.com>

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>
---
 git-mergetool--lib.sh | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/git-mergetool--lib.sh b/git-mergetool--lib.sh
index 9a5aae9..cf52423 100644
--- a/git-mergetool--lib.sh
+++ b/git-mergetool--lib.sh
@@ -240,7 +240,14 @@ show_tool_help () {
 
 guess_merge_tool () {
 	list_merge_tool_candidates
-	echo >&2 "merge tool candidates: $tools"
+	msg="\
+
+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
+"
+	printf "$msg" >&2
 
 	# Loop over each candidate and stop when a valid merge tool is found.
 	for i in $tools

-- 
1.8.0.13.gf25ae33