{"thread":{"id":"34856","subject":"[PATCH] Documentation/git-merge.txt: fix formatting of example block","startedAt":"2013-09-05T15:12:45Z","lastAt":"2013-09-05T17:51:26Z","messageCount":2,"participants":["Andreas Schwab","Junio C Hamano"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"226852","messageId":"87sixjb8uq.fsf@igel.home","threadId":"34856","inReplyTo":null,"subject":"[PATCH] Documentation/git-merge.txt: fix formatting of example block","fromName":"Andreas Schwab","fromEmail":"schwab@linux-m68k.org","sentAt":"2013-09-05T15:12:45Z","receivedAt":"2013-09-05T15:12:45Z","isPatch":true,"sender":{"key":"schwab@linux-m68k.org","avatar":"https://avatars.githubusercontent.com/u/2175493?v=4"},"body":"You need at least four dashes in a line to have it recognized as listing\nblock delimiter by asciidoc.\n\nSigned-off-by: Andreas Schwab <schwab@linux-m68k.org>\n---\n Documentation/git-merge.txt | 4 ++--\n 1 file changed, 2 insertions(+), 2 deletions(-)\n\ndiff --git a/Documentation/git-merge.txt b/Documentation/git-merge.txt\nindex 8c7f2f6..a74c371 100644\n--- a/Documentation/git-merge.txt\n+++ b/Documentation/git-merge.txt\n@@ -186,11 +186,11 @@ In such a case, you can \"unwrap\" the tag yourself before feeding it\n to `git merge`, or pass `--ff-only` when you do not have any work on\n your own. e.g.\n \n----\n+----\n git fetch origin\n git merge v1.2.3^0\n git merge --ff-only v1.2.3\n----\n+----\n \n \n HOW CONFLICTS ARE PRESENTED\n-- \n1.8.4\n\n-- \nAndreas Schwab, schwab@linux-m68k.org\nGPG Key fingerprint = 58CA 54C7 6D53 942B 1756  01D3 44D5 214B 8276 4ED5\n\"And now for something completely different.\"\n"},{"id":"226866","messageId":"xmqqa9jrjgwx.fsf@gitster.dls.corp.google.com","threadId":"34856","inReplyTo":"87sixjb8uq.fsf@igel.home","subject":"Re: [PATCH] Documentation/git-merge.txt: fix formatting of example block","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2013-09-05T17:51:26Z","receivedAt":"2013-09-05T17:51:26Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Thanks.  It seems that this was broken from the beginning at\n77c72780 (Documentation: merging a tag is a special case,\n2013-03-21).\n\nWill apply.\n"}]}