ok, I give in - proxy user
Wes Peters
wes at softweyr.com
Mon Mar 29 21:45:00 PST 2004
On Thursday 18 March 2004 16:12, Doug Barton wrote:
> On Wed, 17 Mar 2004, Ben Paley wrote:
> > Hello,
> >
> > I've read UPDATING and done what it said, but this is what happens to me:
>
> For future reference, running 'mergemaster -p' instead of manually
> adding the user(s)/group(s) will walk you through all the right steps.
Just make sure you're at least HALF awake when you do the merge...
--
Where am I, and what am I doing in this handbasket?
Wes Peters wes at softweyr.com
More information about the freebsd-current
mailing list