Previous Table of Contents Index Next
Perforce 2009.2: Command Reference



P4DIFF
Description
The name and location of the diff program used by p4 resolve and p4 diff.
Usage Notes
Used by
Client?
Used by
Server?
Can be set in P4CONFIG file?
Value if not Explicitly Set
If the environment variable DIFF has been set, then the value of DIFF; otherwise, if the environment variable SHELL has been set to any value, then the program diff is used; otherwise, p4diff.exe.
If the environment variable DIFF has been set, then the value of DIFF; otherwise, Perforce's internal diff routine is used.
Examples
Notes
The value of P4DIFF can contain flags to the called program, for example, diff -u.
The commands p4 describe, p4 diff2, and p4 submit all use a diff program built into the Perforce server program p4d. This cannot be changed.
 


Previous Table of Contents Index Next

Perforce 2009.2: Command Reference
Copyright 1999-2009 Perforce Software.