log easyhg-merge.sh @ 540:fc2df97920e8 fswatcher

age author description
Fri, 25 Nov 2011 09:34:55 +0000 Chris Cannam Add changelog
Thu, 07 Jul 2011 10:59:50 +0100 Chris Cannam Look for easyhg-kdiff3 in preference to plain kdiff3