DiffPlug can integrate into any version control system by calling out to DiffPlug’s command line interface, dp. Below are screenshots of DiffPlug’s Simulink viewer and differ integrated with TortoiseHg.

DiffPlug’s Simulink Viewer:

VCS viewer

DiffPlug’s Simulink Differ:

VCS differ

Getting the path

To integrate with a third party tool, you will first need to find the dp executable, which is in DiffPlug’s installation directory. This can be found in the Modify Installation dialog.

VCS differ

VCS differ

The path to the dp executable depends on the operating system:

OS Path to dp
Windows INSTALL_DIR\dp.exe
OS X INSTALL_DIR/Contents/MacOS/dp
Linux INSTALL_DIR/dp

TortoiseSVN

  • Open the TortoiseSVN settings menu.
  • Select the “External Programs” section.
  • Select the “External” radio button, and copy-paste the following command:

PATH_TO_DP %base %mine --open

TortoiseGit

  • Open the TortoiseGit settings menu.
  • Select the “External Programs->Diff Viewer” section.
  • Select the “External” radio button, and copy-paste the following command:

PATH_TO_DP %base %mine --open

TortoiseHg

Put the following content into your [user home]\.hgrc file:

[merge-tools]
diffplug.executable = PATH_TO_DP
diffplug.args = $local $other --open
diffplug.diffargs = $child $parent1 --open
diffplug.dirdiff = true

# These patterns will encourage DiffPlug for the given extensions
[merge-patterns]
**.slx = diffplug
**.mdl = diffplug
**.png = diffplug

# This will make DiffPlug the default merge and diff tool
[ui]
diff = diffplug
merge = diffplug

Other programs

If you need assistance integrating DiffPlug into another VCS system, don’t hesitate to contact DiffPlug support for assistance.