Merging to resolve conflicts
A merge program displays the differences between yours, theirs, and the
base file, and enables you to select and edit changes to produce the
desired result file. To configure a merge program, set
P4MERGE
to the desired program. To use the merge program
during a resolve, choose the m
option. For details about
using a specific merge program, consult its online help.
After you merge, save your results and exit the merge program. At the
p4 resolve
prompt, choose am
.