Merge with stable
authorMartin Geisler <mg@lazybytes.net>
Wed, 23 Dec 2009 20:34:09 +0100
changeset 10133 8cb482a0d39e
parent 10131 ef5b537433da (current diff)
parent 10132 ebf69364e80f (diff)
child 10134 821793e3049c
Merge with stable
--- a/hgext/win32text.py	Wed Dec 23 19:31:48 2009 +0100
+++ b/hgext/win32text.py	Wed Dec 23 20:34:09 2009 +0100
@@ -137,7 +137,7 @@
                   'and also consider adding:\n'
                   '\n'
                   '[extensions]\n'
-                  'hgext.win32text =\n'
+                  'win32text =\n'
                   '[encode]\n'
                   '** = %sencode:\n'
                   '[decode]\n'
--- a/tests/test-win32text.out	Wed Dec 23 19:31:48 2009 +0100
+++ b/tests/test-win32text.out	Wed Dec 23 20:34:09 2009 +0100
@@ -35,7 +35,7 @@
 and also consider adding:
 
 [extensions]
-hgext.win32text =
+win32text =
 [encode]
 ** = cleverencode:
 [decode]
@@ -214,7 +214,7 @@
 and also consider adding:
 
 [extensions]
-hgext.win32text =
+win32text =
 [encode]
 ** = cleverencode:
 [decode]