facebook/sapling
1
1
Fork 0
mirror of https://github.com/facebook/sapling.git synced 2024-10-07 07:17:55 +03:00
Code Issues Projects Releases Wiki Activity

test-merge6: avoid a shell script

Browse Source
This commit is contained in:
Alexis S. L. Carvalho 2007-03-27 01:41:18 -03:00
parent 03fea0246c
commit 91aeb4643e
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
tests/test-merge6
View File

@ -1,11 +1,10 @@
#!/bin/sh
cat <<'EOF' > merge
#!/bin/sh
echo merging for `basename $1`
cat <<EOF > merge
import sys, os
print "merging for", os.path.basename(sys.argv[1])
EOF
chmod +x merge
HGMERGE=./merge; export HGMERGE
HGMERGE="python ../merge"; export HGMERGE
mkdir A1
cd A1