Meld gnome2 diff and merge tool. A pretty and looks useful (source) diff viewer and merger with CVS support. Very nice if you can manage to build it (gnome2, python2.2+ and lots of other bits) unless you get it already packaged.
Meld gnome2 diff and merge tool. A pretty and looks useful (source) diff viewer and merger with CVS support. Very nice if you can manage to build it (gnome2, python2.2+ and lots of other bits) unless you get it already packaged.