diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2016-10-28 09:01:21 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-10-28 09:01:21 -0700 |
| commit | 311811b39ff3e0f7035e09ec45f992f10beaaa56 (patch) | |
| tree | 3b1c7d809dd2de73d2effbfaf8ff861bda2bfb06 /diffcore-break.c | |
| parent | Merge branch 'jk/tap-verbose-fix' into maint (diff) | |
| parent | doc: fix the 'revert a faulty merge' ASCII art tab spacing (diff) | |
| download | tgif-311811b39ff3e0f7035e09ec45f992f10beaaa56.tar.xz | |
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
Diffstat (limited to 'diffcore-break.c')
0 files changed, 0 insertions, 0 deletions