Helix Core - Diff/Merge/Reviews

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

  • P4Merge: The Helix Core companion diff tool.
  • Other application: Browse to your preferred diff tool.

To specify arguments for third-party diff applications, enter %1 for the name of the first file and %2 for the name of the second file in the Arguments field. Helix Server replaces these placeholders with the actual filenames when calling the diff application.

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

  • P4Merge: The Helix Core companion merge tool.
  • 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

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

To have Helix Swarm reviews open in an external browser (instead of in a new tab in Microsoft Visual Studio, which is the default):

  • Select the Open Swarm reviews in external browser check box.