Merge branch 'rs/maint-config-use-labs' into maint

diff --git a/Documentation/pretty-formats.txt b/Documentation/pretty-formats.txt
index eecc39dec99b3cab3da3e36440653ea46ac762b9..dcf7429a47c4853e18ea06c8b5af4df5ece5c0fa 100644 (file)
--- 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: