diff options
| author |  John Keeping <john@keeping.me.uk> | 2013-01-25 01:43:51 -0800 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2013-01-25 11:08:55 -0800 |
| commit | abaf175cdf85ab0eb8bedd7d84ea8b42b6b3dd01 (patch) | |
| tree | c366e68ea87cd8d97564b5390f5fa3f5d68f286c /mergetools | |
| parent | git-mergetool: don't hardcode 'mergetool' in show_tool_help (diff) | |
| download | tgif-abaf175cdf85ab0eb8bedd7d84ea8b42b6b3dd01.tar.xz | |
git-difftool: use git-mergetool--lib for "--tool-help"
The "--tool-help" option to git-difftool currently displays incorrect
output since it uses the names of the files in
"$GIT_EXEC_PATH/mergetools/" rather than the list of command names in
git-mergetool--lib.
Fix this by simply delegating the "--tool-help" argument to the
show_tool_help function in git-mergetool--lib.
Signed-off-by: John Keeping <john@keeping.me.uk>
Signed-off-by: David Aguilar <davvid@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'mergetools')
0 files changed, 0 insertions, 0 deletions