summaryrefslogtreecommitdiff
path: root/combine-diff.c
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2015-06-05 12:00:20 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2015-06-05 12:00:21 -0700
commit413a715f18be259243aa7edc7b136f6d7a93ab58 (patch)
tree9ccde87b8c191267ee170f12d14c6fd10d1ef550 /combine-diff.c
parentMerge branch 'jk/asciidoc-markup-fix' into maint (diff)
parentdoc: fix unmatched code fences in git-stripspace (diff)
downloadtgif-413a715f18be259243aa7edc7b136f6d7a93ab58.tar.xz
Merge branch 'jk/stripspace-asciidoctor-fix' into maint
A literal block in the tutorial had lines with unequal lengths to delimit it from the rest of the document, which choke GitHub's AsciiDoc renderer. * jk/stripspace-asciidoctor-fix: doc: fix unmatched code fences in git-stripspace
Diffstat (limited to 'combine-diff.c')
0 files changed, 0 insertions, 0 deletions