Open topic with navigation

Merge

To set the default merge application, select one of the following:

1. P4Merge: P4V’s companion merge tool.

2. Other application: Browse to your preferred merge tool.

   To specify arguments for third-party merge applications, enter the following replaceable parameters in the Arguments field:

   • Base file: %b
   • Their/Source file: %1
   • Your/Target file: %2

   • Result file: %r

     P4V replaces these placeholders with the actual filenames when calling the merge application.

To assign merge applications by file type:

1. Click Add.
2. Select a file extension from the drop-down list.
3. Enter or browse for the associated application.

4. Specify arguments for third-party merge applications in the Arguments field:

   Enter the following replaceable parameters in the Arguments field:

   • Base file: %b
   • Their/Source file: %1
   • Your/Target file: %2

   • Result file: %r

     P4V replaces these placeholders with the actual filenames when calling the merge application.

5. Click Save.

   The extension and associated application are displayed in the list of file type-application associations.