summaryrefslogtreecommitdiff
path: root/name-hash.c
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2012-08-06 15:30:18 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2012-08-06 15:30:18 -0700
commitf52a386ef256fbea1618affd85cf62ad8283b2f7 (patch)
tree05751e940605bdf0b26b47e92e01f1cb93ecc55b /name-hash.c
parentGit 1.7.11.4 (diff)
parentmergetool: support --tool-help option like difftool does (diff)
downloadtgif-f52a386ef256fbea1618affd85cf62ad8283b2f7.tar.xz
Merge branch 'jc/mergetool-tool-help' into maint
* jc/mergetool-tool-help: mergetool: support --tool-help option like difftool does
Diffstat (limited to 'name-hash.c')
0 files changed, 0 insertions, 0 deletions