diff -r 82995896d5af -r 7544700fd931 tests/test-merge2
--- a/tests/test-merge2	Mon Mar 13 12:22:55 2006 +0100
+++ b/tests/test-merge2	Mon Mar 13 13:05:41 2006 +0100
@@ -5,15 +5,15 @@
 hg init
 echo This is file a1 > a
 hg add a
-hg commit -m "commit #0" -d "0 0"
+hg commit -m "commit #0" -d "1000000 0"
 echo This is file b1 > b
 hg add b
-hg commit -m "commit #1" -d "0 0"
+hg commit -m "commit #1" -d "1000000 0"
 rm b
 hg update 0
 echo This is file b2 > b
 hg add b
-hg commit -m "commit #2" -d "0 0"
+hg commit -m "commit #2" -d "1000000 0"
 cd ..; /bin/rm -rf t
 
 mkdir t
@@ -21,14 +21,14 @@
 hg init
 echo This is file a1 > a
 hg add a
-hg commit -m "commit #0" -d "0 0"
+hg commit -m "commit #0" -d "1000000 0"
 echo This is file b1 > b
 hg add b
-hg commit -m "commit #1" -d "0 0"
+hg commit -m "commit #1" -d "1000000 0"
 rm b
 hg update 0
 echo This is file b2 > b
-hg commit -A -m "commit #2" -d "0 0"
+hg commit -A -m "commit #2" -d "1000000 0"
 cd ..; /bin/rm -rf t
 
 mkdir t
@@ -36,13 +36,13 @@
 hg init
 echo This is file a1 > a
 hg add a
-hg commit -m "commit #0" -d "0 0"
+hg commit -m "commit #0" -d "1000000 0"
 echo This is file b1 > b
 hg add b
-hg commit -m "commit #1" -d "0 0"
+hg commit -m "commit #1" -d "1000000 0"
 rm b
 hg remove b
 hg update 0
 echo This is file b2 > b
-hg commit -A -m "commit #2" -d "0 0"
+hg commit -A -m "commit #2" -d "1000000 0"
 cd ..; /bin/rm -rf t