Ellie Computing

Merge Pro
Trial versionECMerge: Powerful File and Folder Comparison Tool
Windows
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