diff -r 1184bb274cb3 -r ffb5c09ba822 tests/test-up-local-change.t --- a/tests/test-up-local-change.t Mon Apr 18 20:52:08 2011 -0500 +++ b/tests/test-up-local-change.t Tue Apr 19 12:04:44 2011 +0200 @@ -1,8 +1,7 @@ $ HGMERGE=true; export HGMERGE - $ mkdir r1 + $ hg init r1 $ cd r1 - $ hg init $ echo a > a $ hg addremove adding a