git.99rst.org / git.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: b943a21 6750f62)
Merge branch 'po/fix-doc-merge-base-illustration' into maint
authorJunio C Hamano <redacted>
Fri, 28 Oct 2016 16:01:21 +0000 (09:01 -0700)
committerJunio C Hamano <redacted>
Fri, 28 Oct 2016 16:01:21 +0000 (09:01 -0700)
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


Trivial merge
git clone https://git.99rst.org/PROJECT