--- a/tests/test-merge6.t	Mon Apr 18 20:52:08 2011 -0500
+++ b/tests/test-merge6.t	Tue Apr 19 12:04:44 2011 +0200
@@ -4,9 +4,8 @@
   > EOF
   $ HGMERGE="python ../merge"; export HGMERGE
 
-  $ mkdir A1
+  $ hg init A1
   $ cd A1
-  $ hg init
   $ echo This is file foo1 > foo
   $ echo This is file bar1 > bar
   $ hg add foo bar