Perforce Command Reference:   [Index]  [Prev] [Next]


P4MERGE

Description

A third-party merge program to be used by p4 resolve's merge option.

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

If the MERGE registry or environment variable is set, then its value;

otherwise, nothing.

Examples

Prescient Software's MergeRight

Notes

The program represented by the program name stored in this variable is used only by p4 resolve's merge option. When p4 resolve calls this program, it will pass in four arguments, representing (in order) base, theirs, and yours, with the fourth argument holding the resulting merge file. If the program you use takes its arguments in a different order, set P4MERGE to a shell script that reorders the arguments and calls the proper merge program accordingly.

Please see p4 resolve for more information.



Perforce Command Reference:   [Index]  [Prev] [Next]


Copyright 1998 Perforce Software.
Contact us at [email protected]
Last updated: 06/14/98