tests/test-conflict

--- a/tests/test-conflict	Sat Jul 30 08:30:12 2005 -0800
+++ b/tests/test-conflict	Sat Jul 30 08:35:29 2005 -0800
@@ -1,6 +1,5 @@
 #!/bin/sh
 
-set -x
 hg init
 echo "nothing" > a
 hg add a
@@ -10,7 +9,7 @@
 hg co 0
 echo "something else" > a
 hg commit -m branch2 -d "0 0"
-export HGMERGE=merge
+HGMERGE=merge; export HGMERGE
 hg up -m 1
 hg id
 grep -Ev ">>>|<<<" a