hgmerge

--- a/hgmerge	Fri Mar 10 20:06:41 2006 +0100
+++ b/hgmerge	Fri Mar 10 22:24:19 2006 -0800
@@ -7,6 +7,8 @@
 
 set -e # bail out quickly on failure
 
+echo $1 $2 $3
+
 LOCAL="$1"
 BASE="$2"
 OTHER="$3"