Category:	Developer Tools
Price:	Free
Popularity:	Low
Version String:	2024.3 (2649657)
Release Date:	2024-09-06
Architecture:	Intel & AppleSilicon(ARM)
Minimum OS:	macOS 11.0.0
Vendor Name:	Perforce Software, Inc.
Homepage:	www.perforce.com

Description:

P4Merge — Change You Can See
Using P4Merge to track and compare the effects of past and pending work for branches and individual files with P4Merge. You can also use it to resolve conflicts (even with Git).

Key Features of P4Merge
Visual Diff & Code Merge 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 time frame? 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. 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.