Diffing and merging files with P4 Merge

P4 Merge is a visual diff tool that displays the differences between file versions and helps you to resolve conflicts and merge competing versions into one.

You can use P4 Merge both with:

files that are versioned in P4 Server
files that are not versioned in P4 Server

This chapter includes the following topics: