From 26daa842dc35b2fe522ef18a1404c72421b3894c Mon Sep 17 00:00:00 2001 From: John Keeping Date: Fri, 25 Jan 2013 01:43:49 -0800 Subject: 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 Signed-off-by: David Aguilar Signed-off-by: Junio C Hamano --- git-mergetool--lib.sh | 1 - 1 file changed, 1 deletion(-) (limited to 'git-mergetool--lib.sh') diff --git a/git-mergetool--lib.sh b/git-mergetool--lib.sh index 89a857f508..1748315bc2 100644 --- a/git-mergetool--lib.sh +++ b/git-mergetool--lib.sh @@ -175,7 +175,6 @@ list_merge_tool_candidates () { } show_tool_help () { - TOOL_MODE=merge list_merge_tool_candidates unavailable= available= LF=' ' -- cgit v1.2.3