Setting diff/merge options

Guiffy Software’s compare and merge utility is integrated with Surround SCM. Guiffy is a cross-platform utility used to compare and merge source files, with built-in support for UNICODE, MBCS, and over 150 file encoding formats. Guiffy also provides sophisticated folder and file compare and synchronization capabilities, making the task of merging, upgrading, and identifying changes as easy and as safe as possible. When setting diff/merge options, you can use Guiffy or select another utility.

  1. Choose Tools > User Options.
  2. Click the Diff/Merge tab.
  3. Select Use integrated Guiffy diff/merge utility to use the Guiffy utility.
  4. Click Browse to set the Java Runtime path or the Guiffy path.

  5. Select Use selected diff/merge utilities to use another utility.
  6. Make sure you set the parameters. For more information see Diff/Merge parameters.

  7. Select Allow diff/merge utility to compare binary files to compare binary files.
  8. Click OK to save the settings or click another tab to continue setting user options.

Diff/Merge parameters

Diff
%1
%2

file diff

server file

local file

history diff

older file

newer file

branch diff

branch 1

branch 2

Merge

%1

%2

%3

2-way merge

server file (merge from)

local file (merge to)

 

3-way merge

server file (merge from)

local file (merge to)

common ancestor