Andreas Schwab e45bda876a 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>
2013-09-05 10:50:49 -07:00
..
2013-05-09 13:31:17 -07:00
2012-04-20 15:49:16 -07:00
2013-02-14 10:29:01 -08:00
2012-06-19 11:35:19 -07:00
2013-04-12 12:00:52 -07:00
2013-02-05 16:13:32 -08:00
2011-09-06 11:42:12 -07:00
2013-04-12 12:00:52 -07:00
2011-03-11 10:59:16 -05:00
2013-02-27 10:10:28 -08:00
2013-04-12 12:00:52 -07:00
2013-04-12 12:00:52 -07:00
2013-05-09 13:31:17 -07:00
2013-02-07 14:42:16 -08:00
2013-02-07 14:41:45 -08:00