From e45bda876ae2e39ac1e11ba1609f2c363ad4959a Mon Sep 17 00:00:00 2001 From: Andreas Schwab Date: Thu, 5 Sep 2013 17:12:45 +0200 Subject: [PATCH] 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 Signed-off-by: Junio C Hamano --- Documentation/git-merge.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 -- 2.11.4.GIT