Ellié Computing Merge (ECMerge) is a rich differentiation/comparison and merge tool. It supports side by side, 2-way/3-way. It allows you to compare and merge text files, images, folders, archives and FTP/S sites. ECMerge is multi-platform and works on Windows, Linux and Solaris 10. It generates reports as unix patches, HTML, XML. It exists as a command line or GUI tool.