p4merge for MAC

p4merge allows you to track and compare the results of past and pending work on branches and individual files.

• Visualize Your Merges
• Highlight and edit text file differences
• You can choose to include or not include line endings or white space
• Recognize line-ending conventions in Windows (CRLF), Mac(CR), and Unix/LF
• Use command-line parameters to launch non-Perforce applications
• Display line numbers when merging and comparing files
• Reveal History
• Files that have been modified, unique, or unaltered should be excluded
• Filter files by extension or name
• Modified assets can be organized in familiar file/folder hierarchy
• Compare Images
• Compare JPEGs, GIFs, TIFFs, BMPs, and other file types
• Use the Qt API to extend your work
• Display side-by-side or overlay images
• Highlight differences in overlaid images

Perforce grants access to Helix Core to small teams of five or fewer users. Perforce will provide a quote for other licensing options. Click Here for more.

Version 2017.3:

• 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.