log easyhg-merge.sh @ 518:5c846f3c9244

age author description
Thu, 07 Jul 2011 10:59:50 +0100 Chris Cannam Look for easyhg-kdiff3 in preference to plain kdiff3
Wed, 13 Apr 2011 17:09:57 +0100 Chris Cannam Try to make kdiff3 a bit clearer
Fri, 11 Mar 2011 18:08:22 +0000 Chris Cannam Merge fixes: primarily, handle failed merges better filelist_right_button_menu