diff -r 53872e2be33a -r 4fc63e22b1fe tests/fish-merge --- a/tests/fish-merge Thu Jun 30 23:23:12 2005 -0800 +++ b/tests/fish-merge Thu Jun 30 23:28:16 2005 -0800 @@ -1,3 +1,5 @@ +#!/bin/sh + set -e set -x