ECMerge Pro for Mac

From Ellie Computing:

ECMerge compares and merges local, FTP or SCC repositories data, as text, images, binary files and folders. It compares side-by-side and 3-way. It is designed to make you work with multiple revisions of text files with ease and to keep multiple folder hierarchies in sync. Text files or folders can be compared to a common ancestor to provide automatic merge and verification of evolutions of your code and data. ECMerge saves automatically sessions and let you save your own named sessions to launch them again in one click or with the command line. It generates reports in Unix patch, XML and HTML format for Text, Images and Folder Comparisons. ECMerge is a complete solution able to compare your Word files as well as merging your source code, applying patches with preview or producing CSV reports. Its scripting based on JavaScript let you use its capabilities and define new commands.

View larger image