Perforce Command Reference:
[Index] [Prev] [Next]
P4DIFF
Description
The name and location of the diff program used by p4 resolve and p4 diff.
Usage Notes
Used by
p4 client?
|
Used by p4d server?
|
Command-Line
Alternative
|
Can be set in P4CONFIG file?
|
|---|
|
Yes
|
No
|
None
|
Yes
|
Value if not Explicitly Set
|
OS
|
Value
|
|---|
|
NT
|
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.
|
|
All Others
|
If the environment variable DIFF has been set, then the value of DIFF;
otherwise, p4's internal diff.
|
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 server program p4d. This cannot be changed.
Perforce Command Reference:
[Index] [Prev] [Next]
Copyright 1998 Perforce Software.
Contact us at [email protected]
Last updated: 06/14/98