Junio C Hamano 311811b39f 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

2016-10-28 09:01:21 -07:00

..

keep-canonical-history-correct.txt

…

maintain-git.txt

…

new-command.txt

…

rebase-from-internal-branch.txt

…

rebuild-from-update-hook.txt

…

recover-corrupted-blob-object.txt

…

recover-corrupted-object-harder.txt

…

revert-a-faulty-merge.txt

…

revert-branch-rebase.txt

…

separating-topic-branches.txt

…

setup-git-server-over-http.txt

…

update-hook-example.txt

…

use-git-daemon.txt

…

using-merge-subtree.txt

…

using-signed-tag-in-pull-request.txt

…