[PATCH] Documentation/git-merge.txt: fix formatting of example block

Andreas Schwab· Sep 5, 2013, 15:12 UTC · lore

You need at least four dashes in a line to have it recognized as listing block delimiter by asciidoc.

Signed-off-by: Andreas Schwab <schwab@linux-m68k.org>
---
 Documentation/git-merge.txt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Show changes to Documentation/git-merge.txt +2 −0

diff --git a/Documentation/git-merge.txt b/Documentation/git-merge.txt
index 8c7f2f6..a74c371 100644
--- a/Documentation/git-merge.txt
+++ b/Documentation/git-merge.txt
@@ -186,11 +186,11 @@ In such a case, you can "unwrap" the tag yourself before feeding it
 to `git merge`, or pass `--ff-only` when you do not have any work on
 your own. e.g.
 
----
+----
 git fetch origin
 git merge v1.2.3^0
 git merge --ff-only v1.2.3
----
+----
 
 
 HOW CONFLICTS ARE PRESENTED

-- 
1.8.4

-- 
Andreas Schwab, schwab@linux-m68k.org
GPG Key fingerprint = 58CA 54C7 6D53 942B 1756  01D3 44D5 214B 8276 4ED5
"And now for something completely different."

Junio C Hamano· Sep 5, 2013, 17:51 UTC · re: Andreas Schwab · lore

Re: [PATCH] Documentation/git-merge.txt: fix formatting of example block

Thanks. It seems that this was broken from the beginning at 77c72780 (Documentation: merging a tag is a special case, 2013-03-21).

Will apply.

patchDocumentation/git-merge.txt: fix formatting of example block