| commit | 6750f6269917969dbb191406c3ed31d5a75a9edd | |
| author | Philip Oakley <philipoakley@iee.org> | |
| Mon, 24 Oct 2016 21:54:32 +0000 (24 22:54 +0100) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Tue, 25 Oct 2016 01:09:46 +0000 (24 18:09 -0700) | ||
| tree | 2e9f539e07f2132fe51f5c0776c106f940d4692c | treesnapshot (tar.gz zip) |
| parent | 5dd05ebf6f963a7844cc8208b6c8170698aec222 | commitdiff |
doc: fix the 'revert a faulty merge' ASCII art tab spacing
The asciidoctor doc-tool stack does not always respect the 'tab = 8 spaces' rule
expectation, particularly for the Git-for-Windows generated html pages. This
follows on from the 'doc: fix merge-base ASCII art tab spacing' fix.
Use just spaces within the block of the ascii art.
All other *.txt ascii art containing three dashes has been checked.
Asciidoctor correctly formats the other art blocks that do contain tabs.
Signed-off-by: Philip Oakley <philipoakley@iee.org
Signed-off-by: Junio C Hamano <gitster@pobox.com>
The asciidoctor doc-tool stack does not always respect the 'tab = 8 spaces' rule
expectation, particularly for the Git-for-Windows generated html pages. This
follows on from the 'doc: fix merge-base ASCII art tab spacing' fix.
Use just spaces within the block of the ascii art.
All other *.txt ascii art containing three dashes has been checked.
Asciidoctor correctly formats the other art blocks that do contain tabs.
Signed-off-by: Philip Oakley <philipoakley@iee.org
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| Documentation/howto/revert-a-faulty-merge.txt | diffblobblamehistory |