diff options
| author | Junio C Hamano <gitster@pobox.com> | 2012-07-24 14:05:26 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-07-24 14:05:26 -0700 |
| commit | cf7864837c12c396ad5927cb6c0bbaa790cda7ad (patch) | |
| tree | 93c489a5a4bfb1fde21851d3b9154990ec528b9a /tar.h | |
| parent | 9c3f19fdfd7b8d7fcbebf05d30a8a41054f89d32 (diff) | |
| parent | 109859e27445a3ad12eb8f8cba43a5aa8f701733 (diff) | |
| download | git-cf7864837c12c396ad5927cb6c0bbaa790cda7ad.tar.gz git-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 'tar.h')
0 files changed, 0 insertions, 0 deletions