--- a/hgmerge	Thu Jun 30 23:23:12 2005 -0800
+++ b/hgmerge	Thu Jun 30 23:28:16 2005 -0800
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
 #
 # hgmerge - default merge helper for Mercurial
 #
changeset 547	4fc63e22b1fe
parent 306	f06a4a3b86a7
parent 544	3d4d5f2aba9a
child 795	cd0ad12d9e42
child 808	8f5637f0a0c0
child 814	0902ffece4b4