Merge branch 'bc/asciidoc-pretty-formats-fix'
authorJunio C Hamano <gitster@pobox.com>
Tue, 14 Oct 2014 17:50:14 +0000 (10:50 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 14 Oct 2014 17:50:21 +0000 (10:50 -0700)
* bc/asciidoc-pretty-formats-fix:
Documentation: fix misrender of pretty-formats in Asciidoctor

1  2 
Documentation/pretty-formats.txt
Simple merge