diff -r 583e290e4945 -r ec85f9e6f3b1 tests/test-merge5 --- a/tests/test-merge5 Fri Jul 29 15:11:34 2005 +0100 +++ b/tests/test-merge5 Fri Jul 29 15:19:43 2005 +0100 @@ -1,4 +1,4 @@ -#!/bin/sh -x +#!/bin/sh mkdir t cd t