log easyhg-merge.sh @ 282:1ec306df738e

age author description
Thu, 10 Feb 2011 18:49:01 +0000 Chris Cannam * Use kdiff3 from path if present; return sensible return code