# HG changeset patch
# User Thomas Arendsen Hein <thomas@intevation.de>
# Date 1122645276 -3600
# Node ID 95c258ee52646e6bc143dc8a45ebe385cc5727d8
# Parent  33a272b79e54875a7f68c457faf8036b0fbc2097
Remove "export FOO=bar" bashism.


diff -r 33a272b79e54 -r 95c258ee5264 tests/fish-merge
--- 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