
Minimal may show a smaller set of differences, but may run more slowly. Normal compares versions using the normal diff and is the default option. You may want to change this option to diff results more quickly or view a more compact set of changes.

Select the changes to Ignore when displaying differences in each line in a file.You can change the options while working with code reviews. Select any Code Review Configuration options to indicate how to display differences between file versions in code reviews by default. Side by Side compares documents side-by-side.Ĥ.Compare and Merge displays differences as tracked changes.Select a Microsoft Word Configuration option to indicate how to display differences between Word document versions. Select Use Surround SCM default Guiffy toolbars to display only the Guiffy toolbars used in Surround SCM.ģ.indicates that Guiffy will select the language. Enter the maximum amount of memory for Guiffy to use.Enter the Guiffy path or click Browse to select a directory.Enter the Java runtime path or click Browse to select a directory.Choose Tools > User Options then select Application Settings from the Diff/Merge category.Ģ. Some user options may be disabled, which indicates they are set on the server and cannot be changed.ġ. Note: User options apply only to the current user account logged in to the computer. Viewing differences between file versions in code reviews.Using Guiffy, the integrated diff/merge application.

You can configure settings for applications you use to view differences and merge files. Configuring diff/merge application settings
