diff options
| author | Junio C Hamano <gitster@pobox.com> | 2012-08-06 22:30:18 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-08-06 22:30:18 (GMT) |
| commit | f52a386ef256fbea1618affd85cf62ad8283b2f7 (patch) | |
| tree | 05751e940605bdf0b26b47e92e01f1cb93ecc55b /notes-merge.h | |
| parent | 0e4c8822e98e27c3c63125570c8bcbf0a8fd34da (diff) | |
| parent | 109859e27445a3ad12eb8f8cba43a5aa8f701733 (diff) | |
| download | git-f52a386ef256fbea1618affd85cf62ad8283b2f7.zip git-f52a386ef256fbea1618affd85cf62ad8283b2f7.tar.gz git-f52a386ef256fbea1618affd85cf62ad8283b2f7.tar.bz2 | |
Merge branch 'jc/mergetool-tool-help' into maint
* jc/mergetool-tool-help:
mergetool: support --tool-help option like difftool does
Diffstat (limited to 'notes-merge.h')
0 files changed, 0 insertions, 0 deletions