aboutsummaryrefslogtreecommitdiff
path: root/mergetools
diff options
context:
space:
mode:
authorDavid Aguilar <davvid@gmail.com>2012-08-10 00:39:22 -0700
committerJunio C Hamano <gitster@pobox.com>2012-08-10 08:07:41 -0700
commit7a30747fbacd9a2059e861cba80ebd67685ffe80 (patch)
tree85648c18332a66ea72ff52f9b41744688d7247eb /mergetools
parent190f5475f2a7edb777b65367d8796177aa13c830 (diff)
downloadgit-7a30747fbacd9a2059e861cba80ebd67685ffe80.tar.gz
git-7a30747fbacd9a2059e861cba80ebd67685ffe80.tar.xz
mergetool,difftool: Document --tool-help consistently
Add an entry for --tool-help to the mergetool documentation. Move --tool-help in the difftool documentation so that it is listed immediately after --tool so that it is easier to find. Signed-off-by: David Aguilar <davvid@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'mergetools')
0 files changed, 0 insertions, 0 deletions