mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

git-mergetool: remove redundant assignment

Browse Source 
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>
This commit is contained in:
John Keeping 2013-01-25 01:43:49 -08:00 committed by Junio C Hamano
parent 4a8273a3ed
commit 26daa842dc
1 changed files with 0 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
git-mergetool--lib.sh
View File

@ -175,7 +175,6 @@ list_merge_tool_candidates () {
} }
show_tool_help () { show_tool_help () {
TOOL_MODE=merge
list_merge_tool_candidates list_merge_tool_candidates
unavailable= available= LF=' unavailable= available= LF='
' '