Mercurial > hg > mercurial-crew-with-dirclash

comparison 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
comparison
equal deleted inserted replaced
796:33a272b79e54 797:95c258ee5264
2 2
3 set -e 3 set -e
4 set -x 4 set -x
5 5
6 # skip commit logs 6 # skip commit logs
7 export HGMERGE=tkmerge 7 HGMERGE=tkmerge; export HGMERGE
8 export EDITOR=true 8 EDITOR=true; export EDITOR
9 9
10 rm -rf m m1 m2 10 rm -rf m m1 m2
11 mkdir m 11 mkdir m
12 cd m 12 cd m
13 13