What it does
P4 Merge highlights text changes, merges revisions and compares images, with controls for whitespace and line endings.
For a three-way merge, choose the common base and the two edited files, then select whole-file or individual changes into the result. P4 Merge’s 2026.2 guide also permits editing the bottom result pane directly and says to save before exiting. It works with files outside a P4 Server repository. Whitespace and line-ending choices affect text comparison; supported image formats have a separate visual comparison route. Folder-history comparison described on the product page operates within a P4 environment.
Strengths
- Whitespace and line-ending controls
- Text merging and image comparison
Watch out for
- Documented folder-history comparison uses a P4 environment
Best for
- Comparing revisions in mixed text and image projects
Sources
- Diff Tools and P4 Merge | Perforce Software (Oct 26, 2026)
- Merging files | P4 Merge Documentation 2026.2 (Oct 26, 2026)
- Diffing and merging files with P4 Merge | Documentation 2026.2 (Oct 26, 2026)
- Diff Tools and P4 Merge | Perforce (Oct 26, 2026)