From Ellie Computing:
ECMerge for Debian compares and merges files and folders, side-by-side. It provides syntax coloring 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. Can be used as a replacement of many SCC own merge tool, for better display of changes and more efficient merges. The integrated XML pretty-printing filter allows great comparisons for XML files. In-line differences are detected (at word and/or character level). It compares texts as well as images and binary files for which the usual ASCII + hex view is supported.