From Elliť Computing
ECMerge compares and merges local/FTP/SCC text/images/folders, side-by-side or 3-way.
It is designed for software engineers, web authors and other professionals who work with multiple revisions of text files or who need to keep multiple folder hierarchies in sync. Two text files or folders can be compared to a common ancestor: comparing entire source code branches can give assurance that every change introduced in a particular product release is known and understood. Save your work at intermediate situation and restart it later (full comparison status saved)! Define favourite comparisons as templates to launch them in one click or with the command line. Generates reports in Unix patch, XML and HTML format for Text, Images and Folder Comparisons. Displays Comparisons Statistics on the whole document, or the selected items. Provides syntax colouring for many languages. The integrated XML pretty-printing filter allows great comparisons for XML files, the equivalent output filter can compact the XML into one-line file. In-line differences at word or character level. A security distance can be specified for 3-way file merges so as to attract user attention during risked merges. Ignore lines matching a regular expression. Recursively compare and synchronize trees of folders
IE 4.0 or later on Windows