diff -r 94ad12aa0530 -r 4c94b6d0fb1c tests/test-merge2.t --- a/tests/test-merge2.t Thu Sep 02 22:17:22 2010 +0200 +++ b/tests/test-merge2.t Thu Sep 02 23:22:51 2010 +0200 @@ -3,16 +3,16 @@ $ hg init $ echo This is file a1 > a $ hg add a - $ hg commit -m "commit #0" -d "1000000 0" + $ hg commit -m "commit #0" $ echo This is file b1 > b $ hg add b - $ hg commit -m "commit #1" -d "1000000 0" + $ hg commit -m "commit #1" $ rm b $ hg update 0 0 files updated, 0 files merged, 0 files removed, 0 files unresolved $ echo This is file b2 > b $ hg add b - $ hg commit -m "commit #2" -d "1000000 0" + $ hg commit -m "commit #2" created new head $ cd ..; rm -r t @@ -21,15 +21,15 @@ $ hg init $ echo This is file a1 > a $ hg add a - $ hg commit -m "commit #0" -d "1000000 0" + $ hg commit -m "commit #0" $ echo This is file b1 > b $ hg add b - $ hg commit -m "commit #1" -d "1000000 0" + $ hg commit -m "commit #1" $ rm b $ hg update 0 0 files updated, 0 files merged, 0 files removed, 0 files unresolved $ echo This is file b2 > b - $ hg commit -A -m "commit #2" -d "1000000 0" + $ hg commit -A -m "commit #2" adding b created new head $ cd ..; rm -r t @@ -39,15 +39,15 @@ $ hg init $ echo This is file a1 > a $ hg add a - $ hg commit -m "commit #0" -d "1000000 0" + $ hg commit -m "commit #0" $ echo This is file b1 > b $ hg add b - $ hg commit -m "commit #1" -d "1000000 0" + $ hg commit -m "commit #1" $ rm b $ hg remove b $ hg update 0 0 files updated, 0 files merged, 0 files removed, 0 files unresolved $ echo This is file b2 > b - $ hg commit -A -m "commit #2" -d "1000000 0" + $ hg commit -A -m "commit #2" adding b created new head