tests/test-merge10.t
changeset 12156 4c94b6d0fb1c
parent 11983 27649cf258e3
child 16913 f2719b387380
--- a/tests/test-merge10.t	Thu Sep 02 22:17:22 2010 +0200
+++ b/tests/test-merge10.t	Thu Sep 02 23:22:51 2010 +0200
@@ -7,7 +7,7 @@
   $ mkdir -p testdir
   $ echo a > testdir/a
   $ hg add testdir/a
-  $ hg commit -d '1000000 0' -m a
+  $ hg commit -m a
   $ cd ..
 
   $ hg clone a b
@@ -15,17 +15,17 @@
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ cd a
   $ echo alpha > testdir/a
-  $ hg commit -d '1000000 0' -m remote-change
+  $ hg commit -m remote-change
   $ cd ..
 
   $ cd b
   $ mkdir testdir/subdir
   $ hg mv testdir/a testdir/subdir/a
-  $ hg commit -d '1000000 0' -m move
+  $ hg commit -m move
   $ mkdir newdir
   $ echo beta > newdir/beta
   $ hg add newdir/beta
-  $ hg commit -d '1000000 0' -m local-addition
+  $ hg commit -m local-addition
   $ hg pull ../a
   pulling from ../a
   searching for changes
@@ -43,7 +43,7 @@
   $ hg stat
   M testdir/subdir/a
   $ hg diff --nodates
-  diff -r f7459795031e testdir/subdir/a
+  diff -r bc21c9773bfa testdir/subdir/a
   --- a/testdir/subdir/a
   +++ b/testdir/subdir/a
   @@ -1,1 +1,1 @@