Mercurial > public > mercurial-scm > hg-stable

diff tests/fish-merge @ 797:95c258ee5264

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Remove "export FOO=bar" bashism.
author Thomas Arendsen Hein <thomas@intevation.de>
date Fri, 29 Jul 2005 14:54:36 +0100
parents 4fc63e22b1fe
children 8f5637f0a0c0
line wrap: on
line diff
--- 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