# HG changeset patch
# User Christian Ebert <blacktrash@gmx.net>
# Date 1224355872 -7200
# Node ID fcaea85fcf8defbf57fc7e9b266126615c7ebfce
# Parent  b741dc506a4c578bfc75caa69be055da7720de76# Parent  b87669cce5afdca0ee0c910d50760767bb74d715
Merge with stable

diff -r b741dc506a4c -r fcaea85fcf8d tests/test-keyword.out
--- a/tests/test-keyword.out	Tue Sep 02 08:48:48 2008 -0400
+++ b/tests/test-keyword.out	Sat Oct 18 20:51:12 2008 +0200
@@ -51,6 +51,12 @@
  kwfiles    print files currently configured for keyword expansion
  kwshrink   revert expanded keywords in working directory
 
+enabled extensions:
+
+ keyword   keyword expansion in local repositories
+ mq        patch management and development
+ notify    hook extension to email notifications on commits/pushes
+
 use "hg -v help keyword" to show aliases and global options
 % hg kwdemo
 [extensions]