P4Merge
The Perforce Merge Tool, P4Merge, provides graphical three-way merging and side-by-side file comparisons. 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-Perforce applications
- Displays line numbers when comparing and merging files
- 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
