ECMerge Pro (Linux)

ECMerge compares and merges files and folders, side-by-side or 3-way. It provides syntax colouring for C/C++, Java, HTML, ASP, PHP and many others. XML pretty-printing. In-line differences. Security distance for merges. Save your work at intermediate situation and restart it later! Generate Unix patches between files. A shell extension is provided under Windows. Good replacement for many SCC own merge tool. Available also for Windows.