# HG changeset patch
# User Alexis S. L. Carvalho <alexis@cecm.usp.br>
# Date 1174970478 10800
# Node ID a745860231967f73b1640f85f8c8db29fc783924
# Parent  ccfe423d3d0ac8d5eaa32edac78f9455a6c91661
test-merge6: avoid a shell script

diff -r ccfe423d3d0a -r a74586023196 tests/test-merge6
--- 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