diff options
| author |  Andreas Schwab <schwab@linux-m68k.org> | 2013-09-05 17:12:45 +0200 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2013-09-05 10:50:49 -0700 |
| commit | e45bda876ae2e39ac1e11ba1609f2c363ad4959a (patch) | |
| tree | 945f666c0103249a2acd6732c946d1f5e8bfe864 /mergetools/emerge | |
| parent | fix shell syntax error in template (diff) | |
| download | tgif-e45bda876ae2e39ac1e11ba1609f2c363ad4959a.tar.xz | |
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>
Diffstat (limited to 'mergetools/emerge')
0 files changed, 0 insertions, 0 deletions