P4MERGE

Description

Usage Notes

Used by Perforce Client?	Used by Perforce Server	Command-Line Alternative	Can be set in P4CONFIG file?
Yes	No	None	Yes

Value if not Explicitly Set

Operating System	Value
All	If the MERGE environment variable (or registry variable on NT, as set by p4 set) is set, then its value; otherwise, nothing.

Examples

Prescient Software's MergeRight

Notes

If the program you use takes its arguments in a different order, set P4MERGE to a shell script or batch file that reorders the arguments and calls the proper merge program with the arguments in the correct order.

If you are running under NT, you must call a batch file, even if your third-party merge program already accepts arguments in the order provided by Perforce. This is due to a limitation within NT. If you were using NT and wanted to use a program called MERGE.EXE, your batch file might look something like this:

SET have=%1
SET theirs=%2
SET yours=%3
SET merge=%4
C:\FULL\PATH\TO\MERGE.EXE %have %theirs %yours %merge