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>
David Aguilar committed
Jan 27, 2013 at 16:52 UTC
5338a6a924b9519dfbd3c92142f83d6ecf925097
1 file changed
+7
-1
git-mergetool--lib.sh
+7
-1
@@ -240,7 +240,13 @@ show_tool_help () {
240
241
guess_merge_tool () {
242
list_merge_tool_candidates
243
- echo >&2 "merge tool candidates: $tools"
243
+ cat >&2 <<-EOF
244
+
245
+ This message is displayed because '$TOOL_MODE.tool' is not configured.
246
+ See 'git ${TOOL_MODE}tool --tool-help' or 'git help config' for more details.
247
+ 'git ${TOOL_MODE}tool' will now attempt to use one of the following tools:
248
+ $tools
249
+ EOF
250
251
# Loop over each candidate and stop when a valid merge tool is found.
252
for i in $tools