]> git.ipfire.org Git - thirdparty/git.git/commit
projects / thirdparty / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 80ff2b6) | patch
mergetool--lib: improve the help text in guess_merge_tool()
authorDavid Aguilar <davvid@gmail.com>
Mon, 28 Jan 2013 00:52:24 +0000 (16:52 -0800)
committerJunio C Hamano <gitster@pobox.com>
Tue, 29 Jan 2013 22:31:22 +0000 (14:31 -0800)
commit5338a6a924b9519dfbd3c92142f83d6ecf925097
tree8facb8e8b71cf1e47420a8a6f60da7f045335976tree | snapshot
parent80ff2b68f28193af70d4c0bb9d363531eb1c3d23commit | diff
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>
git-mergetool--lib.sh diff | blob | blame | history
Unnamed repository; edit this file 'description' to name the repository.