| commit | 26daa842dc35b2fe522ef18a1404c72421b3894c | |
| author | John Keeping <john@keeping.me.uk> | |
| Fri, 25 Jan 2013 09:43:49 +0000 (25 01:43 -0800) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Fri, 25 Jan 2013 19:07:39 +0000 (25 11:07 -0800) | ||
| tree | 818c59d8e0838df39b095559acdc210dc4d8b022 | treesnapshot (tar.gz zip) |
| parent | 4a8273a3ed1d9db48920433471f87090423d1b5e | commitdiff |
git-mergetool: remove redundant assignment
TOOL_MODE is set at the top of git-mergetool.sh so there is no need to
set it again in show_tool_help. Removing this lets us re-use
show_tool_help in git-difftool.
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>
TOOL_MODE is set at the top of git-mergetool.sh so there is no need to
set it again in show_tool_help. Removing this lets us re-use
show_tool_help in git-difftool.
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 |