diff --git a/tests/test-conflict b/tests/test-conflict
--- a/tests/test-conflict
+++ b/tests/test-conflict
@@ -4,12 +4,12 @@ set -x
 hg init
 echo "nothing" > a
 hg add a
-hg commit -t ancestor -u test -d "0 0"
+hg commit -m ancestor -d "0 0"
 echo "something" > a
-hg commit -t branch1 -u test -d "0 0"
+hg commit -m branch1 -d "0 0"
 hg co 0
 echo "something else" > a
-hg commit -t branch2 -u test -d "0 0"
+hg commit -m branch2 -d "0 0"
 export HGMERGE=merge
 hg up -m 1
 hg id