--- a/tests/test-conflict	Mon Apr 16 20:17:39 2007 -0300
+++ b/tests/test-conflict	Mon Apr 16 20:17:39 2007 -0300
@@ -9,7 +9,6 @@
 hg co 0
 echo "something else" > a
 hg commit -m branch2 -d "1000000 0"
-HGMERGE=merge; export HGMERGE
 hg merge 1
 hg id
 egrep -v ">>>|<<<" a