| commit | 4abeeb62a04365d7595cd1ef83ce56764c4a8553 | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Wed, 26 Oct 2016 20:14:55 +0000 (26 13:14 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Wed, 26 Oct 2016 20:14:55 +0000 (26 13:14 -0700) | ||
| tree | 20233f75ce13b6742f35825408a5521d825af45b | treesnapshot (tar.gz zip) |
| parent | f4db874d9adc3d974a085b1238aad0048e7f2674 | commitdiff |
| parent | 6750f6269917969dbb191406c3ed31d5a75a9edd | commitdiff |
Merge branch 'po/fix-doc-merge-base-illustration'
Some AsciiDoc formatter mishandles a displayed illustration with
tabs in it. Adjust a few of them in merge-base documentation to
work around them.
* po/fix-doc-merge-base-illustration:
doc: fix the 'revert a faulty merge' ASCII art tab spacing
doc: fix merge-base ASCII art tab spacing
Some AsciiDoc formatter mishandles a displayed illustration with
tabs in it. Adjust a few of them in merge-base documentation to
work around them.
* po/fix-doc-merge-base-illustration:
doc: fix the 'revert a faulty merge' ASCII art tab spacing
doc: fix merge-base ASCII art tab spacing