Mercurial > hg

comparison tests/test-merge6 @ 4295:a74586023196

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
test-merge6: avoid a shell script
author Alexis S. L. Carvalho <alexis@cecm.usp.br>
date Tue, 27 Mar 2007 01:41:18 -0300
parents ad3d5b4367cb
children
comparison
equal deleted inserted replaced
4294:ccfe423d3d0a 4295:a74586023196
1 #!/bin/sh 1 #!/bin/sh
2 2
3 cat <<'EOF' > merge 3 cat <<EOF > merge
4 #!/bin/sh 4 import sys, os
5 echo merging for `basename $1` 5 print "merging for", os.path.basename(sys.argv[1])
6 EOF 6 EOF
7 chmod +x merge 7 HGMERGE="python ../merge"; export HGMERGE
8 HGMERGE=./merge; export HGMERGE
9 8
10 mkdir A1 9 mkdir A1
11 cd A1 10 cd A1
12 hg init 11 hg init
13 echo This is file foo1 > foo 12 echo This is file foo1 > foo