Perforce Visual Merge and Diff Tools
Perforce's merge and diff tools provide a unique perspective into the context in which change happens. The effects of past and pending work can be tracked and contrasted for branches and individual files.
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.
- Text files differences can be highlighted and edited
- Includes or ignores line ending or whitespace differences
- Supports Windows (CRLF), Mac (CR), and Unix (LF) line ending conventions
- Accepts command-line parameters and can be used from non-Peforce applications
- Displays line numbers when comparing and merging files
To get P4Merge, go to Downloads>Browse by Platform>Download P4Merge.
Folder Diff
The Folder Diff tool reveals branch and folder history that has occurred between any two points in time. This includes work pending in branches on a user's local workspace. Folder Diff is a valuable tool for diagnosing the cause of bugs in continuous integration environments. It also effectively measures the amount of code that will need to be resolved in pending merge scenarios.
- Option to exclude files that are modified, unique, or unchanged
- Filter files by name or extension
- Modified assets are organized in familiar file/folder hierarchy
Compare Image Files
Anyone working with graphical content can visually compare two versions using Image Diff (available within P4Merge) to determine what changed between them. Overlay two images to easily isolate what has changed at the pixel level.
- 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
To get FolderDiff, go to Downloads>Browse by Platform>Download P4V.
