diff -r 64d2a558c943 -r 8f5637f0a0c0 tests/test-merge5 --- a/tests/test-merge5 Sat Jul 30 08:30:12 2005 -0800 +++ b/tests/test-merge5 Sat Jul 30 08:35:29 2005 -0800 @@ -1,4 +1,4 @@ -#!/bin/sh -x +#!/bin/sh mkdir t cd t