diff options
| author |  David Aguilar <davvid@gmail.com> | 2013-01-25 01:43:54 -0800 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2013-01-27 18:32:54 -0800 |
| commit | 88d3406ad77dbab4d8ea76756822531228332b1b (patch) | |
| tree | 3bf91cdbb31b5f27312402c005854fd4c0fbbf01 /t/t4045-diff-relative.sh | |
| parent | mergetools/vim: remove redundant diff command (diff) | |
| download | tgif-88d3406ad77dbab4d8ea76756822531228332b1b.tar.xz | |
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>
Diffstat (limited to 't/t4045-diff-relative.sh')
0 files changed, 0 insertions, 0 deletions