# HG changeset patch
# User Matt Mackall <mpm@selenic.com>
# Date 1298843909 21600
# Node ID 0348a66504edb369e9e930d371f7fdc65ed6de23
# Parent  6ec84cbcb94353fa8ed5d3c23caf989b54711121# Parent  28cc153cb03358d08f3e0f1a86df04e6daa4244f
merge with i18n

diff -r 28cc153cb033 -r 0348a66504ed mercurial/help/templates.txt
--- a/mercurial/help/templates.txt	Sat Feb 26 18:21:51 2011 -0300
+++ b/mercurial/help/templates.txt	Sun Feb 27 15:58:29 2011 -0600
@@ -25,6 +25,9 @@
 
 :author: String. The unmodified author of the changeset.
 
+:branch: String. The name of the branch on which the changeset was
+    committed.
+
 :branches: List of strings. The name of the branch on which the
     changeset was committed. Will be empty if the branch name was
     default.