Merge with crew-stable
authorBrendan Cully <brendan@kublai.com>
Tue, 10 Apr 2007 10:34:43 -0700
changeset 4336 35ad84669ca5
parent 4334 1cc5fc1d0994 (current diff)
parent 4335 66a3fe30f9fc (diff)
child 4339 077aafddd35f
child 4343 8b4d4f84b739
Merge with crew-stable
mercurial/templater.py
--- a/mercurial/templater.py
+++ b/mercurial/templater.py
@@ -27,7 +27,7 @@ class templater(object):
     is treated as name of template file.
 
     templater is asked to expand a key in map. it looks up key, and
-    looks for atrings like this: {foo}. it expands {foo} by looking up
+    looks for strings like this: {foo}. it expands {foo} by looking up
     foo in map, and substituting it. expansion is recursive: it stops
     when there is no more {foo} to replace.