Date: Tue, 05 Jun 2007 16:12:30 -0700 From: Doug Barton <dougb@FreeBSD.org> To: Kevin Oberman <oberman@es.net> Cc: freebsd-current@FreeBSD.org, Neil Short <neshort@yahoo.com> Subject: Re: xorg 7.2 & environment variables set in login.conf Message-ID: <4665EDDE.90306@FreeBSD.org> In-Reply-To: <20070605182948.E31B845042@ptavv.es.net> References: <20070605182948.E31B845042@ptavv.es.net>
next in thread | previous in thread | raw e-mail | index | archive | help
Kevin Oberman wrote:
>> I suppose the real moral to the story is: be very
>> careful what you overwrite during mergemaster. It's my
>> guess that I overwrote /etc/login.conf at some point
>> when my eyes were glassed over.
mergemaster doesn't touch /etc/login.conf*, but that does not rule out
the "eyes glazed over" part. :)
> And 'mergemaster -U' is probably your best friend for letting you be
> very, very careful without spending all day doing the merge.
I'm glad that people are finding this feature that Gordon added useful.
Doug
--
This .signature sanitized for your protection
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?4665EDDE.90306>