[layingback]

For those of you on Linux I'd just like to bring your attention to Meld : Diff and merge tool. Should be in your repository, but here's the site link.

It not only lets you compare 2 files (actually up to 3 files) or folders, it also lets you edit either file. The diff display is very nice, and you can either click an arrow to move the difference to other file, hold down Ctrl to insert above/below corresponding line in other file, or directly edit either file!

And if that's not enough, it also has built in CVS interface, basic commands only but enough for routine work, and folder and file comparisons against the controlled version.

I can literally use Meld for all CVS interaction short of making a release. A huge time saver if you've put off checking back in and need to remind yourself what changes you made - we've all "been there, done that!"

For Ubuntu users this link explains how to set up a right-click option in Nautiilus. (Note that if you are on Jaunty you'll need to click on 'Main' in nact to get to the configuration tabs shown in this tut.)

Enjoy!

[DJ Maze]

I use kdiff3 in KDE kdiff3.sourceforge.net/