# HG changeset patch
# User Christian Ebert <blacktrash@gmx.net>
# Date 1245846447 -7200
# Node ID ed69ef4bd191014068088ade3cf3cdb4f0e3712d
# Parent  58569d4d0aec7be02cf14043d3265a434fda9c19# Parent  38c937c7289dc00c99409a3ea136c16e8f3e0e1c
Merge with stable

diff -r 58569d4d0aec -r ed69ef4bd191 tests/test-keyword.out
--- a/tests/test-keyword.out	Tue Jun 23 18:12:44 2009 +0200
+++ b/tests/test-keyword.out	Wed Jun 24 14:27:27 2009 +0200
@@ -56,8 +56,8 @@
 enabled extensions:
 
  keyword   expand keywords in tracked files
- mq        work with a stack of patches
- notify    send e-mail notifications for commits/pushes
+ mq        manage a stack of patches
+ notify    hooks for sending email notifications at commit/push time
 
 use "hg -v help keyword" to show aliases and global options
 % hg kwdemo