Merge with stable
authorChristian Ebert <blacktrash@gmx.net>
Wed, 24 Jun 2009 14:27:27 +0200
changeset 588 ed69ef4bd191
parent 585 58569d4d0aec (current diff)
parent 587 38c937c7289d (diff)
child 590 527257649f20
Merge with stable
--- 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