| commit | e45bda876ae2e39ac1e11ba1609f2c363ad4959a | |
| author | Andreas Schwab <schwab@linux-m68k.org> | |
| Thu, 5 Sep 2013 15:12:45 +0000 (5 17:12 +0200) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Thu, 5 Sep 2013 17:50:49 +0000 (5 10:50 -0700) | ||
| tree | 945f666c0103249a2acd6732c946d1f5e8bfe864 | treesnapshot (tar.gz zip) |
| parent | 6897a64b652d83e477389ec1a248b47b8d821db6 | commitdiff |
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>
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>
| Documentation/git-merge.txt | diffblobblamehistory |