Date: Tue, 21 May 2002 11:42:37 -0700 From: JJ Behrens <jj@nttmcl.com> To: FreeBSD Stable <freebsd-stable@FreeBSD.ORG>, Chip Wiegand <chip@wiegand.org> Subject: Re: makeworld worked - my first attempt at this revisited Message-ID: <20020521114237.B16956@alicia.nttmcl.com> In-Reply-To: <1021840002.14040.47.camel@chip3.wiegand.org>; from chip@wiegand.org on Sun, May 19, 2002 at 01:26:30PM -0700 References: <1021840002.14040.47.camel@chip3.wiegand.org>
next in thread | previous in thread | raw e-mail | index | archive | help
<snip /> > After this I had to add my user account back into /etc/passwd, I thought > I'd taken care of that during the mergemaster, but it didn't show up in > /etc/passwd.I'm still a bit confused by the mergemaster screens. > Everthing I've read refers to there being a split view, left and right, > but that's not what I got. I had the old lines and the new lines all in > one view, with +'s and -'s. So I probably messed up on that, but it was > a simple fix after all was said and done. <snip /> It may be helpful to read the manpage for mergemaster and sdiff. This can be a bit confusing the first time through. :) Congratulations! -jj -- Users of C++ should consider hanging themselves rather than shooting their legs off--it's best not to use C++ simply as a better C. To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-stable" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20020521114237.B16956>