Merge branch 'bc/asciidoc-pretty-formats-fix' into maint

gitster · gitster · commit 27c31d2088a1 · 2014-10-29T10:35:10.000-07:00
* bc/asciidoc-pretty-formats-fix:
  Documentation: fix misrender of pretty-formats in Asciidoctor
diff --git a/Documentation/pretty-formats.txt b/Documentation/pretty-formats.txt
@@ -95,7 +95,7 @@ would show something like this:
 The author of fe6e0ee was Junio C Hamano, 23 hours ago
 The title was >>t4119: test autocomputing -p<n> for traditional diff input.<<
 
---------
+-------
 +
 The placeholders are:
 

Original file line number	Diff line number	Diff line change
`@@ -95,7 +95,7 @@ would show something like this:`
`95`	`95`	`The author of fe6e0ee was Junio C Hamano, 23 hours ago`
`96`	`96`	`The title was >>t4119: test autocomputing -p<n> for traditional diff input.<<`
`97`	`97`
`98`		`---------`
	`98`	`+-------`
`99`	`99`	`+`
`100`	`100`	`The placeholders are:`
`101`	`101`