# HG changeset patch
# User Matt Mackall <mpm@selenic.com>
# Date 1409135428 -7200
# Node ID 926bc0d3b595caf37c5d70833a347eb43285de2f
# Parent  754f208ce21d54df69b3bd0481adc832c8dcbb5e# Parent  05ea941aafdcfd9b4db23654dde9789664a42e3e
merge with stable

diff -r 754f208ce21d -r 926bc0d3b595 mercurial/help/templates.txt
--- 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)