Skip to content

Commit

Permalink
mergetool--lib: improve the help text in guess_merge_tool()
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
davvid authored and gitster committed Jan 29, 2013
1 parent 80ff2b6 commit 5338a6a
Showing 1 changed file with 7 additions and 1 deletion.
8 changes: 7 additions & 1 deletion git-mergetool--lib.sh
Expand Up @@ -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
Expand Down

0 comments on commit 5338a6a

Please sign in to comment.