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.

• Restore Your Workspace to Its Original State - Helix Visual Client 2017.3 allows you to level set and restore your workspace to its original state so that it matches the depot. Users can leverage 2017.3 to rid their workspace of deleted files or ones that are not under source control and refresh the ones that have been modified.
• Boost Stability and Performance with Multiple Parallel Sync - P4V users can now take advantage of the Helix Core 2017.2 enhancements to server resilience during multiple parallel sync operations for a boost in stability and performance.