--- a/tests/test-keyword	Fri Jan 04 16:56:26 2008 +0100
+++ b/tests/test-keyword	Fri Jan 04 17:23:13 2008 +0100
@@ -173,16 +173,16 @@
 # remove path to temp dir
 hg incoming | sed -e 's/^\(comparing with \).*\(test-keyword.*\)/\1\2/'
 
-sed -i.bak -e 's/Id.*/& conflicttest/' a
+sed -i.bak -e 's/Id.*/& rejecttest/' a
 rm a.bak
-echo % commit conflicttest
-hg --debug commit -m'conflict?' -d '3 0' -u 'User Name <user@example.com>'
+echo % commit rejecttest
+hg --debug commit -m'rejects?' -d '3 0' -u 'User Name <user@example.com>'
 echo % export
-hg export -o ../conflicttest.diff tip
+hg export -o ../rejecttest.diff tip
 
 cd ../Test
 echo % import
-hg import ../conflicttest.diff
+hg import ../rejecttest.diff
 echo % cat
 cat sym a b
 echo

--- a/tests/test-keyword.out	Fri Jan 04 16:56:26 2008 +0100
+++ b/tests/test-keyword.out	Fri Jan 04 17:23:13 2008 +0100
@@ -260,21 +260,21 @@
 date:        Thu Jan 01 00:00:02 1970 +0000
 summary:     firstline
 
-% commit conflicttest
+% commit rejecttest
 a
 overwriting a expanding keywords
 % export
 % import
-applying ../conflicttest.diff
+applying ../rejecttest.diff
 % cat
-expand $Id: a 70a392d4a4e4 Thu, 01 Jan 1970 00:00:03 +0000 user $ conflicttest
-do not process $Id: conflicttest
+expand $Id: a 82983f13f138 Thu, 01 Jan 1970 00:00:03 +0000 user $ rejecttest
+do not process $Id: rejecttest
 xxx $
-$Xinfo: User Name <user@example.com>: conflict? $
-expand $Id: a 70a392d4a4e4 Thu, 01 Jan 1970 00:00:03 +0000 user $ conflicttest
-do not process $Id: conflicttest
+$Xinfo: User Name <user@example.com>: rejects? $
+expand $Id: a 82983f13f138 Thu, 01 Jan 1970 00:00:03 +0000 user $ rejecttest
+do not process $Id: rejecttest
 xxx $
-$Xinfo: User Name <user@example.com>: conflict? $
+$Xinfo: User Name <user@example.com>: rejects? $
 ignore $Id$
 
 % rollback