Documentation/git-merge.txt: fix formatting of example block
authorAndreas Schwab <schwab@linux-m68k.org>
Thu, 5 Sep 2013 15:12:45 +0000 (17:12 +0200)
committerJunio C Hamano <gitster@pobox.com>
Thu, 5 Sep 2013 17:50:49 +0000 (10:50 -0700)
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>
No differences found