--- a/tests/test-stabilize-conflict.t	Sun Jun 22 12:01:11 2014 -0400
+++ b/tests/test-stabilize-conflict.t	Sun Jun 22 20:10:07 2014 -0400
@@ -209,7 +209,7 @@
   $ hg amend
   1 new unstable changesets
   $ safesed 's/interactive=.*/interactive=true/' $HGRCPATH
-  $ HGMERGE=touch hg evolve <<EOF
+  $ hg evolve --tool touch <<EOF
   > n
   > EOF
   move:[8] babar count up to fifteen