diff tests/test-merge5.out @ 749:7e4843b7efd2

Update tests to use commit -m and default -u

manifest hash: 6e4385453843031a712005a320d6000595b40d05

--- a/tests/test-merge5.out	Thu Jul 21 12:40:28 2005 -0500
+++ b/tests/test-merge5.out	Thu Jul 21 15:05:17 2005 -0500
@@ -4,12 +4,12 @@
 + echo This is file a1
 + echo This is file b1
 + 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
-+ hg commit '-tcomment #1' -d '0 0' -u user
++ hg commit '-mcomment #1' -d '0 0'
 + hg update 0
 + rm b
-+ hg commit -A '-tcomment #2' -d '0 0' -u user
++ hg commit -A '-mcomment #2' -d '0 0'
 + yes k
 + hg update 1
 this update spans a branch affecting the following files: