--- 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
changeset 547	4fc63e22b1fe
parent 28	9f64ee817199
parent 544	3d4d5f2aba9a
child 797	95c258ee5264
child 808	8f5637f0a0c0
child 814	0902ffece4b4