summaryrefslogtreecommitdiff
path: root/Documentation/git-merge.txt
diff options
context:
space:
mode:
authorAndreas Schwab <schwab@linux-m68k.org>2013-09-05 15:12:45 (GMT)
committerJunio C Hamano <gitster@pobox.com>2013-09-05 17:50:49 (GMT)
commite45bda876ae2e39ac1e11ba1609f2c363ad4959a (patch)
tree945f666c0103249a2acd6732c946d1f5e8bfe864 /Documentation/git-merge.txt
parent6897a64b652d83e477389ec1a248b47b8d821db6 (diff)
downloadgit-e45bda876ae2e39ac1e11ba1609f2c363ad4959a.zip
git-e45bda876ae2e39ac1e11ba1609f2c363ad4959a.tar.gz
git-e45bda876ae2e39ac1e11ba1609f2c363ad4959a.tar.bz2
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>
Diffstat (limited to 'Documentation/git-merge.txt')
-rw-r--r--Documentation/git-merge.txt4
1 files changed, 2 insertions, 2 deletions
diff --git a/Documentation/git-merge.txt b/Documentation/git-merge.txt
index 42391f2..e073375 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