Ellie Computing

ECMerge for Linux
Trial versionCompare and merge files and folders.
Linux
ECMerge for Debian
Trial versionCompare and merge files and folders.
Linux
ECMerge Pro
Trial versionDiffs/merges local/FTP/SCC files/folders 3-way with syntax coloring.
Mac
Merge Pro
Trial versionAnalyze and merge your source code, compare wordprocessors texts, binaries, images and folders.
Windows