ECMerge Pro1.0 Description:
It provides syntax colouring for C/C++, Java, HTML, ASP, PHP and many others. Save your work at intermediate situation and restart it later! Generate Unix patches between files. A shell extension is provided under Windows. A Linux version is available. Can be used as a replacement of many SCC own merge tool, for better display of changes and more efficient merges.