diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2017-07-06 18:14:42 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-07-06 18:14:42 -0700 |
| commit | 33cc9cfc3d0e55539a88b3ed90d310845d652197 (patch) | |
| tree | 72350976c605b22c30bcae64776dc83a178d735f /mergetools/meld | |
| parent | Fourteenth batch for 2.14 (diff) | |
| parent | subtree: honour USE_ASCIIDOCTOR when set (diff) | |
| download | tgif-33cc9cfc3d0e55539a88b3ed90d310845d652197.tar.xz | |
Merge branch 'aw/contrib-subtree-doc-asciidoctor'
The Makefile rule in contrib/subtree for building documentation
learned to honour USE_ASCIIDOCTOR just like the main documentation
set does.
* aw/contrib-subtree-doc-asciidoctor:
subtree: honour USE_ASCIIDOCTOR when set
Diffstat (limited to 'mergetools/meld')
0 files changed, 0 insertions, 0 deletions