undo edit that was accident.
authorVadim Gelfer <vadim.gelfer@gmail.com>
Fri, 10 Mar 2006 23:25:50 -0800
changeset 1881 4392ccefe432
parent 1880 05c7d75be925
child 1884 4e44ca05a866
undo edit that was accident.
hgmerge
--- a/hgmerge	Fri Mar 10 22:24:19 2006 -0800
+++ b/hgmerge	Fri Mar 10 23:25:50 2006 -0800
@@ -7,8 +7,6 @@
 
 set -e # bail out quickly on failure
 
-echo $1 $2 $3
-
 LOCAL="$1"
 BASE="$2"
 OTHER="$3"