Merge with stable
authorChristian Ebert <blacktrash@gmx.net>
Mon, 01 Jun 2009 01:51:50 +0200
changeset 555 3b4b797ba69d
parent 552 baee5f7bfd32 (current diff)
parent 554 2fc480f3e148 (diff)
child 557 05cf88057fc5
Merge with stable
--- a/hgkw/keyword.py	Wed May 27 20:34:38 2009 +0200
+++ b/hgkw/keyword.py	Mon Jun 01 01:51:50 2009 +0200
@@ -66,7 +66,7 @@
 kwdemo" to control the results of your config changes.
 
 Before changing/disabling active keywords, run "hg kwshrink" to avoid
-the risk of inadvertedly storing expanded keywords in the change
+the risk of inadvertently storing expanded keywords in the change
 history.
 
 To force expansion after enabling it, or a configuration change, run
--- a/tests/test-keyword.out	Wed May 27 20:34:38 2009 +0200
+++ b/tests/test-keyword.out	Mon Jun 01 01:51:50 2009 +0200
@@ -31,7 +31,7 @@
 kwdemo" to control the results of your config changes.
 
 Before changing/disabling active keywords, run "hg kwshrink" to avoid
-the risk of inadvertedly storing expanded keywords in the change
+the risk of inadvertently storing expanded keywords in the change
 history.
 
 To force expansion after enabling it, or a configuration change, run