diff --git a/tests/test-merge6 b/tests/test-merge6 --- a/tests/test-merge6 +++ b/tests/test-merge6 @@ -1,11 +1,11 @@ -#!/bin/sh -x +#!/bin/sh cat <<'EOF' > merge #!/bin/sh echo merging for `basename $1` EOF chmod +x merge -export HGMERGE=./merge +HGMERGE=./merge; export HGMERGE mkdir A1 cd A1