From: David Aguilar Date: Fri, 25 Jan 2013 09:43:49 GMT Subject: [PATCH 2/7] git-mergetool: remove redundant assignment Message-ID: <1359107034-14606-3-git-send-email-davvid@gmail.com> In-Reply-To: <1359107034-14606-1-git-send-email-davvid@gmail.com> From: John Keeping 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 --- git-mergetool--lib.sh | 1 - 1 file changed, 1 deletion(-) diff --git a/git-mergetool--lib.sh b/git-mergetool--lib.sh index 89a857f..1748315 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=' ' -- 1.8.1.1.367.g22b1720.dirty