changeset 22295:926bc0d3b595

merge with stable
author Matt Mackall <mpm@selenic.com>
date Wed, 27 Aug 2014 12:30:28 +0200
parents 754f208ce21d (current diff) 05ea941aafdc (diff)
children 650b5b6e75ed
files
diffstat 1 files changed, 2 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/mercurial/help/templates.txt	Mon Aug 25 03:27:51 2014 +0200
+++ b/mercurial/help/templates.txt	Wed Aug 27 12:30:28 2014 +0200
@@ -57,6 +57,8 @@
 
 - label(label, expr)
 
+- pad(text, width[, fillchar, right])
+
 - revset(query[, formatargs])
 
 - rstdoc(text, style)