p4merge
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.
Required OS: not specified
Tags:
diff
, merge
, sound




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