David Aguilar 88d3406ad7 mergetool--lib: improve show_tool_help() output ...

Check the can_diff and can_merge functions before deciding whether
to add the tool to the available/unavailable lists.  This makes
"--tool-help" context-sensitive so that "git mergetool --tool-help"
displays merge tools only and "git difftool --tool-help" displays
diff tools only.

Signed-off-by: David Aguilar <davvid@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

2013-01-27 18:32:54 -08:00

6.0 KiB

Raw Blame History

View Raw