comparison tests/test-merge3 @ 749:7e4843b7efd2

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
comparison
equal deleted inserted replaced
748:c5df1a9c5276 749:7e4843b7efd2
1 #!/bin/sh -x 1 #!/bin/sh -x
2 2
3 hg init 3 hg init
4 echo This is file a1 > a 4 echo This is file a1 > a
5 hg add a 5 hg add a
6 hg commit -t "commit #0" -d "0 0" -u user 6 hg commit -m "commit #0" -d "0 0"
7 touch b 7 touch b
8 hg add b 8 hg add b
9 rm b 9 rm b
10 hg commit -A -t"comment #1" -d "0 0" -u user 10 hg commit -A -m"comment #1" -d "0 0"