diff -r 763be3cd084a -r de793925862e tests/test-merge-symlinks.t
--- a/tests/test-merge-symlinks.t	Wed Oct 20 20:19:34 2010 +0200
+++ b/tests/test-merge-symlinks.t	Tue Oct 19 22:33:52 2010 -0500
@@ -37,7 +37,7 @@
 Merge them and display *_ISLINK vars
 merge heads
 
-  $ HGMERGE="python ../echo.py" hg merge
+  $ hg merge --tool="python ../echo.py"
   HG_FILE l
   HG_MY_ISLINK 1
   HG_OTHER_ISLINK 0