# HG changeset patch
# User Christian Ebert <blacktrash@gmx.net>
# Date 1255984925 -7200
# Node ID 55453609c3d403f66b5f21e34e4618d54940dc40
# Parent  e188e35ff4adee458919cf5a6a58a0f6f34afe85# Parent  fcd29bd314bea3e2f13deb83e76516599c548c5b
Merge with stable

diff -r e188e35ff4ad -r 55453609c3d4 hgkw/keyword.py
--- 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.
 #
diff -r e188e35ff4ad -r 55453609c3d4 tests/test-keyword.out
--- 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