Guiffy Eclipse diff merge tool integration

To use Guiffy as your diff merge tool in Eclipse:
  1. Go to Preferences > Team > SVN > Diff Viewer
  2. Click on the Add... button
  3. Set the Extension/Mime-type field to "*" (without the quotes)
  4. Set the Diff Program Path and Merge Program Path fields to the path for Guiffy command line interface executable (See NOTES below). For example on Windows the path would be something like "C:\Program Files\guiffy115\guiffy.exe" (without the quotes)
  5. Set the Diff program arguments: text area to (with the quotes included):
    -h1"Base ${base}" -h2"Mine ${mine}"
    "${base}" "${mine}"
  6. Set the Merge program arguments: text area to (with the quotes included):
    -s -h1"Theirs ${theirs}" -h2"Mine ${mine}" -hm"Merged ${merged}"
    "${theirs}" "${mine}" "${base}" "${merged}"
NOTES:
The guiffy command line interface executable on Windows is the installed file guiffy.exe
The guiffy command line interface executable on MacOS X is the installed file guiffyCL.command
The guiffy command line interface executable on Linux and Unix is the installed shell script guiffy

Documentation by Guiffy Software, Inc. 2016