| commit | 88d3406ad77dbab4d8ea76756822531228332b1b | |
| author | David Aguilar <davvid@gmail.com> | |
| Fri, 25 Jan 2013 09:43:54 +0000 (25 01:43 -0800) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Mon, 28 Jan 2013 02:32:54 +0000 (27 18:32 -0800) | ||
| tree | 3bf91cdbb31b5f27312402c005854fd4c0fbbf01 | treesnapshot (tar.gz zip) |
| parent | b2a6b7122e66d4882ef5ac31e3a03969b5b6a199 | commitdiff |
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>
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>
| git-mergetool--lib.sh | diffblobblamehistory |