diff -- Display diff of client file with depot file p4 diff [ -d-f -sa -sd -se -sr -t ] [ file[rev] ... ] Run diff (on the client) of a client file against the corresponding revision in the depot. The file is only compared if the file is opened for edit or the revision provided with the file argument is not the same as the revision had by the client. See p4 help revisions for help specifying revisions. If no file argument is given, diff all open files. This can be used to view pending changelists. The -d passes a flag to the built-in diff routine to modify the output: -dn (RCS), -dc (context), -ds (summary), -du (unified). The -f flag forces a diff for every file, regardless of whether they are opened or if the client has the named revision. This can be used to verify the client contents. The -s flag reduces the output of diff to the names of files satisfying the following criteria: -sa Opened files that are different than the revision in the depot, or missing. -sd Unopened files that are missing on the client. -se Unopened files that are different than the revision in the depot. -sr Opened files that are the same as the revision in the depot. The -t flag forces p4 diff to diff even files with non-text (binary) types. If the environment variable $P4DIFF is set then the named program is used rather than the implementation of diff included in the client. The -d command can be used to pass arguments to the external program. The -s flag is only implemented internally.