summaryrefslogtreecommitdiff
path: root/t/t4020
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2012-07-23 14:16:12 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2012-07-23 14:42:39 -0700
commit109859e27445a3ad12eb8f8cba43a5aa8f701733 (patch)
tree669e753fa602ccdfcc2a517b53a7a70800cdf599 /t/t4020
parentGit 1.7.11.3 (diff)
downloadtgif-109859e27445a3ad12eb8f8cba43a5aa8f701733.tar.xz
mergetool: support --tool-help option like difftool does
This way we do not have to risk the list of tools going out of sync between the implementation and the documentation. In the same spirit as bf73fc2 (difftool: print list of valid tools with '--tool-help', 2012-03-29), trim the list of merge backends in the documentation. We do not want to have a complete list of valid tools; we only want a list to help people guess what kind of things the tools do to be specified there, and refer them to --tool-help for a complete list. Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t4020')
0 files changed, 0 insertions, 0 deletions