tests/test-merge-local
changeset 4361 46280c004f22
parent 3869 ad6f34c83c3d
--- a/tests/test-merge-local
+++ b/tests/test-merge-local
@@ -38,13 +38,13 @@ hg diff --nodates | grep "^[+-][^<>]"
 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