Meld is this awesome diff and merge tool that earns plenty of coolness points for all the amazing features that it provides [three way merges, directory diffs, tabs for multiple simultaneous diffs, syntax highlighting, user defined editor, cvs/svn plugins, all those pretty curves in the diffs ;) etc.]. It is by far the best diff and merge tool
(
Read more... )