Mercurial > hg-stable

diff 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
line wrap: on
line diff
--- a/tests/test-merge6	Tue Mar 27 01:41:17 2007 -0300
+++ b/tests/test-merge6	Tue Mar 27 01:41:18 2007 -0300
@@ -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