Environment Variable
|
DIFF
|
EDITOR
|
MERGE
|
Description
|
Name and location of the `diff' program used by
p4 resolve and
p4 diff .
|
Editor used by p4 commands that bring up forms, such as p4 client and p4 user
|
MERGE program used by p4 resolve's merge command
|
Command-Line Alternative
|
|
|
|
Used by p4?
|
Yes
|
Yes
|
Yes
|
Used by p4d?
|
No
|
No
|
No
|
Examples
|
diff
diff -b
windiff
compare
|
vi
emacs
SimpleText
|
Prescient Software's
MergeRight
|
Value if not Explicitly Set
|
UNIX:
diff
NT: If SHELL set, diff ; otherwise, windiff .
|
UNIX: vi
NT: if SHELL is set, vi ; otherwise, notepad
VMS: if POSIX$SHELL is set, vi ; otherwise, edit
Mac: if EDITOR_SIGNATURE is set, the program with that four-character creator; otherwise, SimpleText .
|
<none>
|
Notes
|
p4 describe ,
p4 diff2 , and
p4 submit use the server diff , which is usually GNU diff .
This EV can contain flags to diff, such as diff -b .
|
|
This program is used only by p4 resolve 's merge command. It takes four arguments, representing yours, theirs, base, and the resulting merge file.
|