I've been spending a lot more time using CVS for my source code control. As such, I was ercently in need of a good diff/merge utility, so I could compare the code base for a test and production application that I hadn't personally looked at in about 5 years. The app recently started experiencing problems, and in order to figure out what was going on, I needed to see what may be different in the test code vs. the production code.

Anyhow, to make a long story short, someone recommended I check out WinMerge, an open source diff/merge tool that integrates nicely with CVS. I downloaded the tool, installed it, and told it which directories/files I wanted it to compare. Within 30 seconds, it had a nice list for me showing exactly which files in my beta/production folders were different.

This is a tool I really wish was built into Homesite + or Dreamweaver MX. Since it isn't, I highly recommend WinMerge.