Mercurial > hg

diff tests/test-merge1 @ 800:ec85f9e6f3b1

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Don't use 'set -x', fix exports, sed and hexdump usage for Solaris.
author Thomas Arendsen Hein <thomas@intevation.de>
date Fri, 29 Jul 2005 15:19:43 +0100
parents 7e4843b7efd2
children 8f5637f0a0c0
line wrap: on
line diff
--- a/tests/test-merge1	Fri Jul 29 15:11:34 2005 +0100
+++ b/tests/test-merge1	Fri Jul 29 15:19:43 2005 +0100
@@ -1,4 +1,4 @@
-#!/bin/sh -x
+#!/bin/sh
 
 cat <<'EOF' > merge
 #!/bin/sh