diff options
| author | Junio C Hamano <gitster@pobox.com> | 2016-10-26 13:14:55 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-10-26 13:14:55 -0700 |
| commit | 4abeeb62a04365d7595cd1ef83ce56764c4a8553 (patch) | |
| tree | 20233f75ce13b6742f35825408a5521d825af45b /git-merge-resolve.sh | |
| parent | f4db874d9adc3d974a085b1238aad0048e7f2674 (diff) | |
| parent | 6750f6269917969dbb191406c3ed31d5a75a9edd (diff) | |
| download | git-4abeeb62a04365d7595cd1ef83ce56764c4a8553.tar.gz | |
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
Diffstat (limited to 'git-merge-resolve.sh')
0 files changed, 0 insertions, 0 deletions