undo edit that was accident.

hgmerge

@@ -7,8 +7,6 b''
 
 set -e # bail out quickly on failure
 
-echo $1 $2 $3
-
 LOCAL="$1"
 BASE="$2"
 OTHER="$3"