ECMerge Standard (Linux)

ECMerge compares and merges files and folders, side-by-side. 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. Good replacement for many SCC own merge tool. XML pretty-printing. In-line differences. Security distance for merges