aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohn Keeping <john@keeping.me.uk>2013-01-25 01:43:49 -0800
committerJunio C Hamano <gitster@pobox.com>2013-01-25 11:07:39 -0800
commit26daa842dc35b2fe522ef18a1404c72421b3894c (patch)
tree818c59d8e0838df39b095559acdc210dc4d8b022
parent4a8273a3ed1d9db48920433471f87090423d1b5e (diff)
downloadgit-26daa842dc35b2fe522ef18a1404c72421b3894c.tar.gz
git-26daa842dc35b2fe522ef18a1404c72421b3894c.tar.xz
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>
-rw-r--r--git-mergetool--lib.sh1
1 files changed, 0 insertions, 1 deletions
diff --git a/git-mergetool--lib.sh b/git-mergetool--lib.sh
index 89a857f50..1748315bc 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='
'