p4merge Universal Binary

Version: 2007.2 || Release Date: 2007-08-07 || License: Freeware Developer: Perforce

The Perforce Visual Merge Tool, P4Merge, allows users to visualize the differences between file versions. P4Merge uses color coding to simplify the process of resolving conflicts that result from parallel or concurrent development. P4Merge includes the option to automatically merge non-conflicting changes.

Suggest screenshot/icon / Suggest new version