From: Andreas Schwab <schwab@linux-m68k.org>
Date: Thu, 5 Sep 2013 15:12:45 +0000 (+0200)
Subject: Documentation/git-merge.txt: fix formatting of example block
X-Git-Tag: v1.8.4.3~9^2~1
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/e45bda876ae2e39ac1e11ba1609f2c363ad4959a?ds=inline;hp=--cc

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

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>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---

e45bda876ae2e39ac1e11ba1609f2c363ad4959a
diff --git a/Documentation/git-merge.txt b/Documentation/git-merge.txt
index 42391f2ae7..e07337592a 100644
--- a/Documentation/git-merge.txt
+++ b/Documentation/git-merge.txt
@@ -187,11 +187,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