--- a/tests/test-resolve.t	Wed Oct 20 20:19:34 2010 +0200
+++ b/tests/test-resolve.t	Tue Oct 19 22:33:52 2010 -0500
@@ -21,7 +21,7 @@
 
 failing merge
 
-  $ HGMERGE=internal:fail hg merge
+  $ hg merge --tool=internal:fail
   0 files updated, 0 files merged, 0 files removed, 1 files unresolved
   use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon
   [1]