Guiffy Software, Inc

Free
A visual file compare, diff merge and folder compare tool for Windows