summaryrefslogtreecommitdiff
path: root/contrib
diff options
context:
space:
mode:
authorLibravatar Andreas Schwab <schwab@linux-m68k.org>2013-09-05 17:12:45 +0200
committerLibravatar Junio C Hamano <gitster@pobox.com>2013-09-05 10:50:49 -0700
commite45bda876ae2e39ac1e11ba1609f2c363ad4959a (patch)
tree945f666c0103249a2acd6732c946d1f5e8bfe864 /contrib
parentfix shell syntax error in template (diff)
downloadtgif-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 'contrib')
0 files changed, 0 insertions, 0 deletions