Mercurial > public > mercurial-scm > hg-stable

diff tests/test-merge3 @ 749:7e4843b7efd2

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Update tests to use commit -m and default -u manifest hash: 6e4385453843031a712005a320d6000595b40d05
author mpm@selenic.com
date Thu, 21 Jul 2005 15:05:17 -0500
parents 2fe8d66e3075
children ec85f9e6f3b1 8f5637f0a0c0 0902ffece4b4
line wrap: on
line diff
--- a/tests/test-merge3	Thu Jul 21 12:40:28 2005 -0500
+++ b/tests/test-merge3	Thu Jul 21 15:05:17 2005 -0500
@@ -3,8 +3,8 @@
 hg init
 echo This is file a1 > a
 hg add a
-hg commit -t "commit #0" -d "0 0" -u user
+hg commit -m "commit #0" -d "0 0"
 touch b
 hg add b
 rm b
-hg commit -A -t"comment #1" -d "0 0" -u user
+hg commit -A -m"comment #1" -d "0 0"