log easyhg-merge.sh @ 464:6fc4fafc5e6b

age author description
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
Mon, 21 Feb 2011 18:16:15 +0000 Chris Cannam Return success if the external diff/merge _is_ found, not if it isn't!