Mercurial > hg > mercurial-crew-with-dirclash

diff tests/fish-merge @ 808:8f5637f0a0c0

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge with TAH
author mpm@selenic.com
date Sat, 30 Jul 2005 08:35:29 -0800
parents 4fc63e22b1fe 95c258ee5264
children 0902ffece4b4
line wrap: on
line diff
--- a/tests/fish-merge
+++ b/tests/fish-merge
@@ -4,8 +4,8 @@ set -e
 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