> 3-way merge: usr/src/uts/i86pc/os/cpupm.c > patch: **** Only garbage was found in the patch input.
When I've gotten this, it was because the file was listed in the wx active file, but it didn't actually have any contents changes. Could that be what's happening here? (This looks like another hole in my test cases.) mike
