From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 28 Oct 2016 16:01:21 +0000 (-0700)
Subject: Merge branch 'po/fix-doc-merge-base-illustration' into maint
X-Git-Tag: v2.10.2~7
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/311811b39ff3e0f7035e09ec45f992f10beaaa56?hp=--cc

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

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
---

311811b39ff3e0f7035e09ec45f992f10beaaa56