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>
Martin Ågren committed
Sep 7, 2019 at 16:12 UTC
b7e1ba56497f0633d3cc98ecc25a08eed144e687
1 file changed
+15
-11
Documentation/git-merge-index.txt
+15
-11
@@ -54,20 +54,24 @@ original is first. But the argument order to the 3-way merge program
54
55
Examples:
56
57
- torvalds@ppc970:~/merge-test> git merge-index cat MM
58
- This is MM from the original tree. # original
59
- This is modified MM in the branch A. # merge1
60
- This is modified MM in the branch B. # merge2
61
- This is modified MM in the branch B. # current contents
57
+----
58
+torvalds@ppc970:~/merge-test> git merge-index cat MM
59
+This is MM from the original tree. # original
60
+This is modified MM in the branch A. # merge1
61
+This is modified MM in the branch B. # merge2
62
+This is modified MM in the branch B. # current contents
63
+----
64
65
or
66
65
- torvalds@ppc970:~/merge-test> git merge-index cat AA MM
66
- cat: : No such file or directory
67
- This is added AA in the branch A.
68
- This is added AA in the branch B.
69
- This is added AA in the branch B.
70
- fatal: merge program failed
67
+----
68
+torvalds@ppc970:~/merge-test> git merge-index cat AA MM
69
+cat: : No such file or directory
70
+This is added AA in the branch A.
71
+This is added AA in the branch B.
72
+This is added AA in the branch B.
73
+fatal: merge program failed
74
+----
75
76
where the latter example shows how 'git merge-index' will stop trying to
77
merge once anything has returned an error (i.e., `cat` returned an error