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>
John Keeping committed
Jan 25, 2013 at 01:43 UTC
26daa842dc35b2fe522ef18a1404c72421b3894c
1 file changed
-1
git-mergetool--lib.sh
-1
@@ -175,7 +175,6 @@ list_merge_tool_candidates () {
175
}
176
177
show_tool_help () {
178
- TOOL_MODE=merge
178
list_merge_tool_candidates
179
unavailable= available= LF='
180
'