# HG changeset patch
# User Christian Ebert <blacktrash@gmx.net>
# Date 1346339883 -3600
# Node ID feb663195388a4e918f5073d4159705ea599e8f7
# Parent  d76328c84f3ed0dd1c91f8ba6f00c917c0e5d1a0# Parent  f4dcce73f36243502cc4c89f81c910187860e097
Merge with stable

diff -r d76328c84f3e -r feb663195388 hgkw/keyword.py
--- a/hgkw/keyword.py	Thu Aug 09 12:52:34 2012 +0100
+++ b/hgkw/keyword.py	Thu Aug 30 16:18:03 2012 +0100
@@ -7,7 +7,7 @@
 #
 # $Id$
 #
-# Keyword expansion hack against the grain of a DSCM
+# Keyword expansion hack against the grain of a Distributed SCM
 #
 # There are many good reasons why this is not needed in a distributed
 # SCM, still it may be useful in very small projects based on single
@@ -168,7 +168,7 @@
     return subfunc(r'$\1$', text)
 
 def _preselect(wstatus, changed):
-    '''Retrieves modfied and added files from a working directory state
+    '''Retrieves modified and added files from a working directory state
     and returns the subset of each contained in given changed files
     retrieved from a change context.'''
     modified, added = wstatus[:2]
diff -r d76328c84f3e -r feb663195388 tests/test-keyword.t
--- a/tests/test-keyword.t	Thu Aug 09 12:52:34 2012 +0100
+++ b/tests/test-keyword.t	Thu Aug 30 16:18:03 2012 +0100
@@ -727,7 +727,7 @@
   ignore $Id$
   a
 
-Write custom keyword and prepare multiline commit message
+Write custom keyword and prepare multi-line commit message
 
   $ echo '$Xinfo$' >> a
   $ cat <<EOF >> log
@@ -745,7 +745,7 @@
   ? c
   ? log
 
-Commit with multiline message and custom expansion
+Commit with multi-line message and custom expansion
 
   $ hg --debug commit -l log -d '2 0' -u 'User Name <user@example.com>'
   a