keithstric.com

I forgot where I saw this tool but I believe it was on one of the Lotus community blogs. I've been using WinMerge now for quite a few months and I think it is a great tool. It allows you to compare 2 text files with each other and it highlights the differences between the 2 files and allows you to merge the differences. Pretty cool! Now I'm sure it probably does more, but this is the main feature I use it for.

If you get a chance you should check out WinMerge as I'm to the point now that I don't know how I ever got along without it.