diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2012-08-06 15:30:18 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-08-06 15:30:18 -0700 |
| commit | f52a386ef256fbea1618affd85cf62ad8283b2f7 (patch) | |
| tree | 05751e940605bdf0b26b47e92e01f1cb93ecc55b /t/t9800-git-p4.sh | |
| parent | Git 1.7.11.4 (diff) | |
| parent | mergetool: support --tool-help option like difftool does (diff) | |
| download | tgif-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 't/t9800-git-p4.sh')
0 files changed, 0 insertions, 0 deletions