
ECMerge
ECMerge is a comparison and synchronization tool with two and three-way merge for text and folders and difference on binary, text, images and folders, locally, via FTP/S, SFTP or in version controls. For Windows, Mac OS X, Solaris and Linux. It includes Xtract to let you compare Microsoft Word, OpenOffice Writer and RTF files.