p4merge

Version: 2010.2/334844 || Release Date: 2010-03-31 || License: Freeware Developer: Perforce | App Owner: daubman

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

2 Opinions

The only/best diff tool that handles non-English text well. The merge interface is a bit weird but workable, for simple diffs it's good.

I use this with git on OS X. Here's how: http://www.andymcintosh.com/?p=33