--- a/tests/test-merge5	Thu Jul 21 12:40:28 2005 -0500
+++ b/tests/test-merge5	Thu Jul 21 15:05:17 2005 -0500
@@ -6,12 +6,12 @@
 echo This is file a1 > a
 echo This is file b1 > b
 hg add a b
-hg commit -t "commit #0" -d "0 0" -u user
+hg commit -m "commit #0" -d "0 0"
 echo This is file b22 > b
-hg commit -t"comment #1" -d "0 0" -u user
+hg commit -m"comment #1" -d "0 0"
 hg update 0
 rm b
-hg commit -A -t"comment #2" -d "0 0" -u user
+hg commit -A -m"comment #2" -d "0 0"
 # in theory, we shouldn't need the "yes k" below, but it prevents
 # this test from hanging when "hg update" erroneously prompts the
 # user for "keep or delete"