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
..
2016-10-11 14:24:02 -07:00
2016-09-12 15:03:32 -07:00
2016-07-13 11:24:14 -07:00
2016-07-13 11:24:14 -07:00
2016-07-28 11:25:54 -07:00
2015-07-21 14:08:14 -07:00
2016-08-11 14:35:42 -07:00
2015-10-05 12:30:13 -07:00
2016-10-03 13:24:18 -07:00
2016-03-03 13:43:36 -08:00