log easyhg-merge.sh @ 383:1affc7820bef

age author description
Wed, 13 Apr 2011 17:09:57 +0100 Chris Cannam Try to make kdiff3 a bit clearer