p4merge

p4merge lets you track and compare the effects of past and pending work for branches and individual files.

• Visualize Your Merges
• Highlight and edit text file differences
• Choose to include or ignore line endings or white spaces
• Recognize line-ending conventions for Windows (CRLF), Mac (CR), and Unix (LF)
• Use command-line parameters and launch from non-Perforce applications
• Display line numbers when comparing and merging files
• Reveal History
• Exclude files that are modified, unique, or unchanged
• Filter files by name or extension
• Organize modified assets in familiar file/folder hierarchy
• Compare Images
• Compare JPEG, GIF, TIFF, BMP, and other file formats
• Extend using the Qt API
• Overlay images or display side-by-side
• Highlight differences on overlaid images

Perforce allows small teams of 5 or fewer users free access to Helix Core. Other licensing options will require a quote from Perforce. Click here for information.