summaryrefslogtreecommitdiff
path: root/xdiff
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2012-07-24 14:05:26 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2012-07-24 14:05:26 -0700
commitcf7864837c12c396ad5927cb6c0bbaa790cda7ad (patch)
tree93c489a5a4bfb1fde21851d3b9154990ec528b9a /xdiff
parentMerge branch 'jk/maint-commit-document-editmsg' (diff)
parentmergetool: support --tool-help option like difftool does (diff)
downloadtgif-cf7864837c12c396ad5927cb6c0bbaa790cda7ad.tar.xz
Merge branch 'jc/mergetool-tool-help'
"git mergetool" did not support --tool-help option to give the list of supported backends, like "git difftool" does. * jc/mergetool-tool-help: mergetool: support --tool-help option like difftool does
Diffstat (limited to 'xdiff')
0 files changed, 0 insertions, 0 deletions