diff -r 94ad12aa0530 -r 4c94b6d0fb1c tests/test-merge-revert2 --- a/tests/test-merge-revert2 Thu Sep 02 22:17:22 2010 +0200 +++ b/tests/test-merge-revert2 Thu Sep 02 23:22:51 2010 +0200 @@ -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 "1000000 0" -u user +hg commit -m "added file1 and file2" echo "changed file1" >> file1 -hg commit -m "changed file1" -d "1000000 0" -u user +hg commit -m "changed file1" hg -q log hg id hg update -C 0