Guiffy Software, Inc.

Free
Visual file compare diff tool, folder compare, and merge tool.