| commit | 5338a6a924b9519dfbd3c92142f83d6ecf925097 | |
| author | David Aguilar <davvid@gmail.com> | |
| Mon, 28 Jan 2013 00:52:24 +0000 (27 16:52 -0800) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Tue, 29 Jan 2013 22:31:22 +0000 (29 14:31 -0800) | ||
| tree | 8facb8e8b71cf1e47420a8a6f60da7f045335976 | treesnapshot (tar.gz zip) |
| parent | 80ff2b68f28193af70d4c0bb9d363531eb1c3d23 | commitdiff |
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>
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 | diffblobblamehistory |