P4Merge User Guide (2017.3)
Diffing and merging files with P4Merge
P4Merge is a visual diff tool that displays the differences between file versions and helps you to resolve conflicts and merge competing versions into one.
This chapter includes the following topics: