diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2015-05-22 12:41:48 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-05-22 12:41:48 -0700 |
| commit | 236794f1eb85da0dbc83389ebe509476b0c8769e (patch) | |
| tree | 10fba9bc4ae5762e674a23d7cc0acd41175c9de6 /git-mergetool.sh | |
| parent | Merge branch 'sg/help-subcommands' (diff) | |
| parent | doc: fix unmatched code fences (diff) | |
| download | tgif-236794f1eb85da0dbc83389ebe509476b0c8769e.tar.xz | |
Merge branch 'ja/tutorial-asciidoctor-fix'
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.
* ja/tutorial-asciidoctor-fix:
doc: fix unmatched code fences
Diffstat (limited to 'git-mergetool.sh')
0 files changed, 0 insertions, 0 deletions