ECMerge

Comparison, merge and synchronization tool on text, binaries, images and folders with 3-way support. For Windows, OS X, Linux and Solaris.