Perforce 2006.1 Command Reference
<< Previous Chapter
P4DEBUG
Table of Contents
Index
Perforce on the Web
Next Chapter >>
P4DIFFUNICODE

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?

Command-Line Alternative
Can be set in P4CONFIG file?

Yes

No

None

Yes

Value if not Explicitly Set

Operating System
Value

Windows

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, Perforce's internal diff routine is used.

Examples

diff

diff -b

windiff.exe

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.


Perforce 2006.1 Command Reference
<< Previous Chapter
P4DEBUG
Table of Contents
Index
Perforce on the Web
Next Chapter >>
P4DIFFUNICODE
Please send comments and questions about this manual to manual@perforce.com.
Copyright 1999-2006 Perforce Software. All rights reserved.
Last updated: 06/23/06