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>
Andreas Schwab committed
Sep 5, 2013 at 17:12 UTC
e45bda876ae2e39ac1e11ba1609f2c363ad4959a
1 file changed
+2
-2
Documentation/git-merge.txt
+2
-2
@@ -187,11 +187,11 @@ In such a case, you can "unwrap" the tag yourself before feeding it
187
to `git merge`, or pass `--ff-only` when you do not have any work on
188
your own. e.g.
189
190
----
190
+----
191
git fetch origin
192
git merge v1.2.3^0
193
git merge --ff-only v1.2.3
194
----
194
+----
195
196
197
HOW CONFLICTS ARE PRESENTED