Browse Source

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>
maint
David Aguilar 12 years ago committed by Junio C Hamano
parent
commit
5338a6a924
  1. 8
      git-mergetool--lib.sh

8
git-mergetool--lib.sh

@ -240,7 +240,13 @@ show_tool_help () { @@ -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

Loading…
Cancel
Save