Commit 5338a6a9 authored by David Aguilar's avatar David Aguilar Committed by Junio C Hamano

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's avatarDavid Aguilar <>
Signed-off-by: default avatarJunio C Hamano <>
parent 80ff2b68
......@@ -240,7 +240,13 @@ show_tool_help () {
guess_merge_tool () {
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:
# Loop over each candidate and stop when a valid merge tool is found.
for i in $tools
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment