tests/test-merge-local
changeset 12156 4c94b6d0fb1c
parent 4365 46280c004f22
--- a/tests/test-merge-local	Thu Sep 02 22:17:22 2010 +0200
+++ b/tests/test-merge-local	Thu Sep 02 23:22:51 2010 +0200
@@ -11,7 +11,7 @@
     echo "merge ok $i" >> zzz1_merge_ok
 done
 echo "merge bad" > zzz2_merge_bad
-hg ci -Am "revision 0" -d "1000000 0"
+hg ci -Am "revision 0"
 
 echo "# revision 1"
 hg rm remove
@@ -22,7 +22,7 @@
 echo "new first line" > zzz1_merge_ok
 hg cat zzz1_merge_ok >> zzz1_merge_ok
 echo "new last line" >> zzz2_merge_bad
-hg ci -m "revision 1" -d "1000000 0"
+hg ci -m "revision 1"
 
 echo "# local changes to revision 0"
 hg co 0