]> git.ipfire.org Git - thirdparty/git.git/commit
Merge branch 'po/fix-doc-merge-base-illustration' into maint
authorJunio C Hamano <gitster@pobox.com>
Fri, 28 Oct 2016 16:01:21 +0000 (09:01 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 28 Oct 2016 16:01:21 +0000 (09:01 -0700)
commit311811b39ff3e0f7035e09ec45f992f10beaaa56
tree3b1c7d809dd2de73d2effbfaf8ff861bda2bfb06
parentb943a213fe6740f64e2ce3fafebce453814115d9
parent6750f6269917969dbb191406c3ed31d5a75a9edd
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