diff options
| author |  Philip Oakley <philipoakley@iee.org> | 2016-10-24 22:54:32 +0100 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2016-10-24 18:09:46 -0700 |
| commit | 6750f6269917969dbb191406c3ed31d5a75a9edd (patch) | |
| tree | 2e9f539e07f2132fe51f5c0776c106f940d4692c /mergetools/gvimdiff | |
| parent | doc: fix merge-base ASCII art tab spacing (diff) | |
| download | tgif-6750f6269917969dbb191406c3ed31d5a75a9edd.tar.xz | |
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>
Diffstat (limited to 'mergetools/gvimdiff')
0 files changed, 0 insertions, 0 deletions