ECMerge Pro (Linux)
ECMerge compares and merges files and folders, side-by-side or 3-way. Syntax colouring for many languages. Configure third-party programs to import PDF, Office documents, or open ZIP/RAR archives. XML pretty-printing. In-line differences. Security distance for merges. Save your work at intermediate situation and restart it later! Generate patch/XML/HTML reports. Good replacement for many SCC own merge tool. Available also for Windows. Discounts for Educational, free licence for Open-source contributors.