diff

Diff files to compare, accept, or reject differences between two versions.

sscm diff File [-bBranch1[:Branch2]] [-h] [-pRepository] [-i|-i-] [-uDiffUtility] [-c] [-vVersion1[:Version2]] [-y[Username:Password|+|=]] [-zSCMServerAddr:PortNum|zPath] [+u]

Option	Description
File	File to compare.
-b	Branch that contains files. If not specified, default working directory branch is used. You can compare a file in the working directory with a file in a branch, files in the same branch, or files between two branches.
-c	Display differences between file in working directory and checked out version.
-h	Display online help for the command.
-i	Use integrated Guiffy diff/merge utility. Enter -i- to use diff/merge utility specified in -u.
-p	Full path to repository, including parent repositories. If not specified, default working directory repository is used.
-u	Full path to diff utility. Enter %1 for first file, %2 for second file, and any other utility options. If a merge utility is not specified, default utility is used.
-v	Version to compare differences for.
-y	Enter a Surround SCM username and password if you do not want to use the default value. To use single sign-on, enter -y+. If you use an identity provider to authenticate, the provider web page opens if you have not yet authenticated. Authenticate with the provider and then return to the CLI.
-z	Enter the Surround SCM Server host computer address and port number if you do not want to use the default value. IPv6 addresses must be in square brackets. If you received a server settings file from your Surround SCM administrator, enter the path to the XML file instead of entering the server connection information.
+u	Display output in Unicode (Windows only). Output cannot be sent to a file. If output is enabled for all commands, enter +u- to disable it for this command.