--- a/tests/test-merge-local	Mon Apr 16 20:17:39 2007 -0300
+++ b/tests/test-merge-local	Mon Apr 16 20:17:39 2007 -0300
@@ -38,13 +38,13 @@
 hg st
 
 echo "# local merge with conflicts"
-HGMERGE=merge hg co
+hg co
 hg co 0
 hg diff --nodates | grep "^[+-][^<>]"
 hg st
 
 echo "# local merge without conflicts"
 hg revert zzz2_merge_bad
-HGMERGE=merge hg co
+hg co
 hg diff --nodates | grep "^[+-][^<>]"
 hg st