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 <>
This now uses a cat << here-doc. | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/ b/
index 9a5aae9..db3eb58 100644
--- a/
+++ b/
@@ -240,8 +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

To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to
More majordomo info at

Reply via email to