# HG changeset patch
# User Matt Mackall <mpm@selenic.com>
# Date 2014-08-27 10:30:28
# Node ID 926bc0d3b595caf37c5d70833a347eb43285de2f
# Parent  754f208ce21d54df69b3bd0481adc832c8dcbb5e
# Parent  05ea941aafdcfd9b4db23654dde9789664a42e3e

merge with stable

diff --git a/mercurial/help/templates.txt b/mercurial/help/templates.txt
--- a/mercurial/help/templates.txt
+++ b/mercurial/help/templates.txt
@@ -57,6 +57,8 @@ In addition to filters, there are some b
 
 - label(label, expr)
 
+- pad(text, width[, fillchar, right])
+
 - revset(query[, formatargs])
 
 - rstdoc(text, style)