# [PATCH] Documentation/git-merge.txt: fix formatting of example block 2 messages from 2013-09-05 to 2013-09-05. Participants: Andreas Schwab, Junio C Hamano. Thread: https://gitlist.dev/t/34856 ## Andreas Schwab, 2013-09-05 15:12 Subject: [PATCH] Documentation/git-merge.txt: fix formatting of example block Message-ID: <87sixjb8uq.fsf@igel.home> URL: https://gitlist.dev/e/87sixjb8uq.fsf%40igel.home ``` You need at least four dashes in a line to have it recognized as listing block delimiter by asciidoc. Signed-off-by: Andreas Schwab --- 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 8c7f2f6..a74c371 100644 --- a/Documentation/git-merge.txt +++ b/Documentation/git-merge.txt @@ -186,11 +186,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 -- 1.8.4 -- Andreas Schwab, schwab@linux-m68k.org GPG Key fingerprint = 58CA 54C7 6D53 942B 1756 01D3 44D5 214B 8276 4ED5 "And now for something completely different." ``` ## Junio C Hamano, 2013-09-05 17:51 Subject: Re: [PATCH] Documentation/git-merge.txt: fix formatting of example block Message-ID: URL: https://gitlist.dev/e/xmqqa9jrjgwx.fsf%40gitster.dls.corp.google.com In-Reply-To: <87sixjb8uq.fsf@igel.home> ``` Thanks. It seems that this was broken from the beginning at 77c72780 (Documentation: merging a tag is a special case, 2013-03-21). Will apply. ```