changeset 1933 | 7544700fd931 |
parent 981 | 4f81068ed8cd |
child 2029 | d436b21b20dc |
--- a/tests/test-merge-revert2 Mon Mar 13 12:22:55 2006 +0100 +++ b/tests/test-merge-revert2 Mon Mar 13 13:05:41 2006 +0100 @@ -7,9 +7,9 @@ echo "another line of text" >> file1 echo "added file2" > file2 hg add file1 file2 -hg commit -m "added file1 and file2" -d "0 0" -u user +hg commit -m "added file1 and file2" -d "1000000 0" -u user echo "changed file1" >> file1 -hg commit -m "changed file1" -d "0 0" -u user +hg commit -m "changed file1" -d "1000000 0" -u user hg -q log hg id hg update -C 0