>>>>> "John" == John Levon <john.levon at sun.com> writes:
John> 3-way merge: usr/src/uts/i86pc/os/cpupm.c patch: **** Only garbage John> was found in the patch input. I looked more carefully at the code, and it only tries to do a 3-way merge if diff exits with a non-zero status. Please give me a pointer to your Teamware workspace to look at. Thanks for the continued feedback, BTW. mike
