Perforce Merge
Perforce calls third-party merge tools with four filename parameters.
Perforce refers to these files as: "base", "theirs", "yours", and "merge".
And, these filenames are passed in that order.
In Guiffy terms the "base" file is the parent file, the "theirs" file is the 1st file,
the "yours" file is the 2nd file, and the "merge" file is the result file.
Guiffy's order for these file name parameters is different(1st, 2nd, parent, result).
And, Guiffy command line
options are required to specify a 3-way merge and (optionally) set the file name
header prefixes to Perforce's terminology.
To integrate Guiffy with Perforce make a script file for your platform, lets call
it "p4guiffy.bat". The following will select Guiffy's 3-way SureMerge option and
reorder the filename parameters:
guiffy -s %2 %3 %1 %4
The following also sets the file name header prefixes:
guiffy -s -p1theirs -p2yours -pmmerge %2 %3 %1 %4
Then, set the P4MERGE environment variable to your script(P4MERGE=p4guiffy.bat).
NOTE: the syntax for specifying the odered parameters will vary of course depending
upon your platform and script shell applied.