Merge with stable
authorChristian Ebert <blacktrash@gmx.net>
Mon, 19 Oct 2009 22:42:05 +0200
changeset 659 55453609c3d4
parent 654 e188e35ff4ad (current diff)
parent 657 fcd29bd314be (diff)
child 661 55e769bd66f7
Merge with stable
--- a/hgkw/keyword.py	Thu Oct 01 13:39:15 2009 +0200
+++ b/hgkw/keyword.py	Mon Oct 19 22:42:05 2009 +0200
@@ -15,7 +15,7 @@
 # audience not running a version control system.
 #
 # For in-depth discussion refer to
-# <http://www.selenic.com/mercurial/wiki/index.cgi/KeywordPlan>.
+# <http://mercurial.selenic.com/wiki/KeywordPlan>.
 #
 # Keyword expansion is based on Mercurial's changeset template mappings.
 #
--- a/tests/test-keyword.out	Thu Oct 01 13:39:15 2009 +0200
+++ b/tests/test-keyword.out	Mon Oct 19 22:42:05 2009 +0200
@@ -280,7 +280,7 @@
 adding manifests
 adding file changes
 added 2 changesets with 3 changes to 3 files
-updating working directory
+updating to branch default
 3 files updated, 0 files merged, 0 files removed, 0 files unresolved
 % incoming
 comparing with test-keyword/Test