SourceGear, LLC.

Free
Application to visually compare and merge files.
Free
It's a handy application meant to visually compare and merge files