Meld
- A gnome2 diff, and merge tool for file comparisons. Edit files in place and the differences are updated dynamically. It also integrates with CVS either as an external tool or via the built in browser.