summaryrefslogtreecommitdiff
path: root/merge-file.c
diff options
context:
space:
mode:
authorLibravatar John Keeping <john@keeping.me.uk>2013-01-25 01:43:49 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2013-01-25 11:07:39 -0800
commit26daa842dc35b2fe522ef18a1404c72421b3894c (patch)
tree818c59d8e0838df39b095559acdc210dc4d8b022 /merge-file.c
parentgit-mergetool: move show_tool_help to mergetool--lib (diff)
downloadtgif-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>
Diffstat (limited to 'merge-file.c')
0 files changed, 0 insertions, 0 deletions