# HG changeset patch # User Vadim Gelfer # Date 1142061950 28800 # Node ID 4392ccefe4321d1d061a9f9f9b6f399818462cdd # Parent 05c7d75be9256c1575d20b9a7f886422877fdb9a undo edit that was accident. diff -r 05c7d75be925 -r 4392ccefe432 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"