| commit | b7e1ba56497f0633d3cc98ecc25a08eed144e687 | |
| author | Martin Ågren <martin.agren@gmail.com> | |
| Sat, 7 Sep 2019 14:12:52 +0000 (7 16:12 +0200) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Mon, 9 Sep 2019 18:05:52 +0000 (9 11:05 -0700) | ||
| tree | 626f38ce192448ee7e6e2d6b1b1cb177d7adb419 | treesnapshot (tar.gz zip) |
| parent | 38cadf9e4733e9b5df92c580a25492b3c1081b80 | commitdiff |
git-merge-index.txt: wrap shell listing in "----"
The example output of `git merge-index` has been enriched by a second
"column" of helpful comments. When Asciidoctor renders this, the cells
in that second column aren't aligned.
Fix this by marking the example shell session as a code listing by
wrapping it in "----". Also drop some of the horizontal space between
the two columns so that we fit into 80 columns. This changes the
rendering with both AsciiDoc and Asciidoctor. They now render this
identically, nicely aligned, and within 80 columns.
Signed-off-by: Martin Ågren <martin.agren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
The example output of `git merge-index` has been enriched by a second
"column" of helpful comments. When Asciidoctor renders this, the cells
in that second column aren't aligned.
Fix this by marking the example shell session as a code listing by
wrapping it in "----". Also drop some of the horizontal space between
the two columns so that we fit into 80 columns. This changes the
rendering with both AsciiDoc and Asciidoctor. They now render this
identically, nicely aligned, and within 80 columns.
Signed-off-by: Martin Ågren <martin.agren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| Documentation/git-merge-index.txt | diffblobblamehistory |