I just ran across Beyond Compare recently, at my new job.
I really like it because you can do compares across two
directory trees, comparing files with the same name.
Both files are displayed side by side, with options to
copy sections of code from one file to another, as
differences are encountered.
Traditionally, I've used diff and grep heavily in the Unix
environment, and IDE tools like those in JBuilder in the Windows
Environment.
Glen Austin
CTO of DoThePlan.com (personal company)
Senior Programmer for iSoft, Corporation (full-time)
I'd rather you quote the personal one, 'cause I get free publicity
and I'll get a web page up before the article is published.
DoThePlan.com is a project of mine to provide project planning
tools over the web. I also have MedSched.net which is another
project to provide Medical Scheduling tools.
But, if you must, then my "day job" is at iSoft.