--- a/tests/test-conflict.out Thu Jul 21 12:40:28 2005 -0500
+++ b/tests/test-conflict.out Thu Jul 21 15:05:17 2005 -0500
@@ -1,12 +1,12 @@
+ hg init
+ echo nothing
+ hg add a
-+ hg commit -t ancestor -u test -d '0 0'
++ hg commit -m ancestor -d '0 0'
+ echo something
-+ hg commit -t branch1 -u test -d '0 0'
++ hg commit -m branch1 -d '0 0'
+ hg co 0
+ echo 'something else'
-+ hg commit -t branch2 -u test -d '0 0'
++ hg commit -m branch2 -d '0 0'
+ export HGMERGE=merge
+ HGMERGE=merge
+ hg up -m 1