--- a/tests/test-globalopts Mon Apr 16 20:17:39 2007 -0300 +++ b/tests/test-globalopts Mon Apr 16 20:17:39 2007 -0300 @@ -17,7 +17,7 @@ hg clone a c cd c hg pull -f ../b -HGMERGE=merge hg merge +hg merge cd ..