Change 32480
Routine merge for SDP from Classic to Streams, done with:
p4 merge -b SDP_Classic_to_Streams
p4 resolve -as
The automatic-safe resolve handled all files; neither '-am' nor interative resolves were needed.
p4 merge -b SDP_Classic_to_Streams
p4 resolve -as
The automatic-safe resolve handled all files; neither '-am' nor interative resolves were needed.
Tip: Use n and p to cycle through the changes.