summaryrefslogtreecommitdiff
path: root/merge-file.c
diff options
context:
space:
mode:
authorLibravatar John Keeping <john@keeping.me.uk>2013-01-25 01:43:48 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2013-01-25 11:07:30 -0800
commit4a8273a3ed1d9db48920433471f87090423d1b5e (patch)
tree8d60508e5db6d8c4d4c1e8232b9530dc0b537648 /merge-file.c
parentGit 1.8.0 (diff)
downloadtgif-4a8273a3ed1d9db48920433471f87090423d1b5e.tar.xz
git-mergetool: move show_tool_help to mergetool--lib
This is the first step in unifying "git difftool --tool-help" and "git mergetool --tool-help". 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