Beyond Compare 3 is the ideal tool for comparing files and folders on your Windows or Linux system. Visualize changes in your code and carefully reconcile them.
BC3 means 3-way merge. Merge your changes with someone else's using a common ancestor as a basis. Interfaces with popular version control systems.
Folder synchronization just got a whole lot easier. Manage rollouts, update your website, backup your laptop. Copy only the data that's changed for quicker syncs.
A beta release of version 4.0 is now available. Mac OSX now supported.