ecmerge compares and merges local/ftp/scc text/images/folders, side-by-side.
it provides syntax colouring for many languages, has auto-configured converters for many office and archive format, pretty prints xml. in-line differences. security distance for merges. generate patch/xml/html reports. good replacement for many scc merge tools. also runs on windows, mac os x & solaris