| commit | 4a8273a3ed1d9db48920433471f87090423d1b5e | |
| author | John Keeping <john@keeping.me.uk> | |
| Fri, 25 Jan 2013 09:43:48 +0000 (25 01:43 -0800) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Fri, 25 Jan 2013 19:07:30 +0000 (25 11:07 -0800) | ||
| tree | 8d60508e5db6d8c4d4c1e8232b9530dc0b537648 | treesnapshot (tar.gz zip) |
| parent | 8c7a786b6c8eae8eac91083cdc9a6e337bc133b0 | commitdiff |
git-mergetool: move show_tool_help to mergetool--lib
This is the first step in unifying "git difftool --tool-help" and
"git mergetool --tool-help".
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>
This is the first step in unifying "git difftool --tool-help" and
"git mergetool --tool-help".
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>
| git-mergetool--lib.sh | diffblobblamehistory | |
| git-mergetool.sh | diffblobblamehistory |