Date: Fri, 16 May 2008 14:42:49 +0000 From: Pollywog <lists-fbsdstable@shadypond.com> To: freebsd-stable@freebsd.org Subject: Re: today's build is causing errors for me Message-ID: <200805161442.51667.lists-fbsdstable@shadypond.com> In-Reply-To: <20080516061724.GA47953@eos.sc1.parodius.com> References: <784966050805151644m43b9a5e1qe8a4568576fc081f@mail.gmail.com> <784966050805152304t1827c53bi6988ae9c8f837f32@mail.gmail.com> <20080516061724.GA47953@eos.sc1.parodius.com>
next in thread | previous in thread | raw e-mail | index | archive | help
On Friday 16 May 2008 06:17:24 Jeremy Chadwick wrote: > > Additionally, mergemaster isn't a confusing mess. If anything, it's one > of the most simple tools there is for managing /etc. The part you > probably find "confusing", which is the same part I did when I started > using it, is the side-by-side interactive diff. It's very easy to use; > "r" means use the text shown on the right, and "l" means use the text > shown on the left. That is certainly the part that confused me until I referred to the "Absolute FreeBSD" book.
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200805161442.51667.lists-fbsdstable>