summaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorDavid Aguilar <davvid@gmail.com>2013-01-27 16:52:24 -0800
committerJunio C Hamano <gitster@pobox.com>2013-01-29 14:31:22 -0800
commit5338a6a924b9519dfbd3c92142f83d6ecf925097 (patch)
tree8facb8e8b71cf1e47420a8a6f60da7f045335976 /Documentation
parent80ff2b68f28193af70d4c0bb9d363531eb1c3d23 (diff)
downloadgit-5338a6a924b9519dfbd3c92142f83d6ecf925097.tar.gz
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>
Diffstat (limited to 'Documentation')
0 files changed, 0 insertions, 0 deletions