Change You Can See with P4Merge
Track and compare the effects of past and pending work for branches and individual files.
Key Features of P4Merge
Visual Merge Tool and Diff Tool for Designers and Developers Alike
Visualize Your Merges
Visualize the differences between file versions with P4Merge. Resolve conflicts that result from parallel or concurrent development via color coding and:
- 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
Need to know what changed during a certain window of time? Folder Diff reveals branch and folder history between any two points in time. A valuable tool for diagnosing continuous integration bugs, Folder Diff also measures how much code must be resolved in pending merge scenarios.
- Exclude files that are modified, unique, or unchanged
- Filter files by name or extension
- Organize modified assets in familiar file/folder hierarchy
Compare Images
Visually compare two versions using image diff within P4Merge to determine changes made. You can even overlay two images to easily isolate pixel-level changes.
- 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
Get The Latest Version
Download the latest version of Merge and Diff Tools (P4Merge) for Helix, the fastest, most securable set of tools for global software development throughout the entire lifecycle of a project.