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.

Tip

You can use P4Merge both with:

  • files that are versioned in Helix Core

  • files that are not versioned in Helix Core

This chapter includes the following topics: