diff -r c1ec4ffd1279 -r 98656ffb1cec tests/test-keyword
--- a/tests/test-keyword	Fri Dec 21 00:40:25 2007 +0100
+++ b/tests/test-keyword	Fri Dec 21 00:42:09 2007 +0100
@@ -173,7 +173,24 @@
 # remove path to temp dir
 hg incoming | sed -e 's/^\(comparing with \).*\(test-keyword.*\)/\1\2/'
 
+sed -i.bak -e 's/Id.*/& conflicttest/' a
+rm a.bak
+echo % commit conflicttest
+hg --debug commit -m'conflict?' -d '3 0' -u 'User Name <user@example.com>'
+echo % export
+hg export -o ../conflicttest.diff tip
+
 cd ../Test
+echo % import
+hg import ../conflicttest.diff
+echo % cat
+cat sym a b
+echo
+echo % rollback
+hg rollback
+echo % clean update
+hg update --clean
+
 echo % kwexpand/kwshrink on selected files
 mkdir x
 echo % copy a x/a