John Levon <john.levon at sun.com> writes: > On Wed, Aug 29, 2007 at 03:39:12PM -0700, Mike Kupfer wrote: > >> I've put in fixes for the issues that John raised (thanks!) and posted a >> new webrev at http://cr.opensolaris.org/~kupfer/wx2hg/. There's also an > > This version behaved better. I'm still getting stuff like: > > 3-way merge: usr/src/uts/i86pc/os/cpupm.c > patch: **** Only garbage was found in the patch input. > > though. I end up with an untouched .c file and an empty .rej file loaded into > my editor. Any ideas?
Is it in your active list, but otherwise unchanged? -- Rich
