Merge branch 'po/fix-doc-merge-base-illustration'

Browse source

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

...

This commit is contained in:

Junio C Hamano 2016-10-26 13:14:55 -07:00

parent f4db874d9a 6750f62699

commit 4abeeb62a0

2 changed files with 21 additions and 21 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show stats Download patch file Download diff file Expand all files Collapse all files