--- a/tests/test-keyword.out	Tue Jan 29 17:32:25 2008 +0100
+++ b/tests/test-keyword.out	Tue Jan 29 17:33:00 2008 +0100
@@ -46,6 +46,7 @@
 
 list of commands:
 
+ kwcat      output the current or given revision of files expanding keywords
  kwdemo     print [keywordmaps] configuration and an expansion example
  kwexpand   expand keywords in working directory
  kwfiles    print files currently configured for keyword expansion
@@ -130,7 +131,7 @@
 do not process $Id:
 xxx $
 ignore $Id$
-% hg cat
+% hg kwcat
 expand $Id: a,v f782df5f9602 1970/01/01 00:00:00 user $
 do not process $Id:
 xxx $
@@ -239,7 +240,7 @@
 do not process $Id:
 xxx $
 ignore $Id$
-% hg cat
+% hg kwcat
 expand $Id: a f782df5f9602 Thu, 01 Jan 1970 00:00:00 +0000 user $
 do not process $Id:
 xxx $
@@ -266,7 +267,7 @@
 xxx $
 $Xinfo: User Name <user@example.com>: firstline $
 ignore $Id$
-% hg cat
+% hg kwcat
 expand $Id: a 0729690beff6 Thu, 01 Jan 1970 00:00:02 +0000 user $
 do not process $Id:
 xxx $
@@ -293,7 +294,7 @@
 added 1 changesets with 3 changes to 3 files
 3 files updated, 0 files merged, 0 files removed, 0 files unresolved
 % incoming
-comparing with test-keyword/Test-a/../Test
+comparing with test-keyword/Test
 searching for changes
 changeset:   1:0729690beff6
 tag:         tip
@@ -359,27 +360,10 @@
 xxx $
 $Xinfo$
 ignore $Id$
-% hg cat
+% hg kwcat
 expand $Id: a 0729690beff6 Thu, 01 Jan 1970 00:00:02 +0000 user $
 do not process $Id:
 xxx $
 $Xinfo: User Name <user@example.com>: firstline $
 ignore $Id$
 a
-% cat
-expand $Id$
-do not process $Id:
-xxx $
-$Xinfo$
-expand $Id$
-do not process $Id:
-xxx $
-$Xinfo$
-ignore $Id$
-% hg cat
-expand $Id$
-do not process $Id:
-xxx $
-$Xinfo$
-ignore $Id$
-a