mirror of
https://github.com/git/git
synced 2024-08-27 11:39:22 +00:00
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>
This commit is contained in:
parent
6897a64b65
commit
e45bda876a
|
@ -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
|
to `git merge`, or pass `--ff-only` when you do not have any work on
|
||||||
your own. e.g.
|
your own. e.g.
|
||||||
|
|
||||||
---
|
----
|
||||||
git fetch origin
|
git fetch origin
|
||||||
git merge v1.2.3^0
|
git merge v1.2.3^0
|
||||||
git merge --ff-only v1.2.3
|
git merge --ff-only v1.2.3
|
||||||
---
|
----
|
||||||
|
|
||||||
|
|
||||||
HOW CONFLICTS ARE PRESENTED
|
HOW CONFLICTS ARE PRESENTED
|
||||||
|
|
Loading…
Reference in a new issue