changeset 13956 | ffb5c09ba822 |
parent 12156 | 4c94b6d0fb1c |
child 16913 | f2719b387380 |
--- a/tests/test-merge2.t Mon Apr 18 20:52:08 2011 -0500 +++ b/tests/test-merge2.t Tue Apr 19 12:04:44 2011 +0200 @@ -1,6 +1,5 @@ - $ mkdir t + $ hg init t $ cd t - $ hg init $ echo This is file a1 > a $ hg add a $ hg commit -m "commit #0" @@ -34,9 +33,8 @@ created new head $ cd ..; rm -r t - $ mkdir t + $ hg init t $ cd t - $ hg init $ echo This is file a1 > a $ hg add a $ hg commit -m "commit #0"