diff -r ce5474dd2a9a -r 9107f7a3fd12 tests/test-keyword
--- 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