--- a/tests/fish-merge	Fri Jul 29 14:52:45 2005 +0100
+++ b/tests/fish-merge	Fri Jul 29 14:54:36 2005 +0100
@@ -4,8 +4,8 @@
 set -x
 
 # skip commit logs
-export HGMERGE=tkmerge
-export EDITOR=true
+HGMERGE=tkmerge; export HGMERGE
+EDITOR=true; export EDITOR
 
 rm -rf m m1 m2
 mkdir m