hgmerge
changeset 544 3d4d5f2aba9a
parent 306 f06a4a3b86a7
child 547 4fc63e22b1fe
--- a/hgmerge	Thu Jun 30 22:10:19 2005 +0100
+++ b/hgmerge	Fri Jul 01 07:22:27 2005 +0100
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
 #
 # hgmerge - default merge helper for Mercurial
 #