ECMerge is complete comparison and merge solution for texts, images and folders, local, through FTP/S and even inside SCC repositories, side-by-side or 3-way. It provides syntax colouring for C/C++, Java, HTML, ASP, PHP and many others, in-line differences. It generates and can apply or preview Unix patches between files. A shell extension is provided under Windows. A Linux version is available. It saves you precious time by its precision and all the handy shortcuts and macro-commands that are developped in standard JavaScript.
Further reading: beta
