log hgmerge @ 1647:64a1169c927d

age author description
Sun, 29 Jan 2006 10:10:00 +1300 Christian Ebert Use of opendiff as merge program on MacOS X
Mon, 24 Oct 2005 14:55:53 -0700 levon Fix use of diff(1) triggered by set -e.
Thu, 04 Aug 2005 13:31:25 -0800 mpm Merge with BOS