From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 26 Oct 2016 20:14:55 +0000 (-0700)
Subject: Merge branch 'po/fix-doc-merge-base-illustration'
X-Git-Tag: v2.11.0-rc0~27
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=4abeeb62a04365d7595cd1ef83ce56764c4a8553;p=git

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

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

4abeeb62a04365d7595cd1ef83ce56764c4a8553