Date: Mon, 03 Mar 2008 10:55:37 -0500 From: Lowell Gilbert <freebsd-questions-local@be-well.ilk.org> To: Chris Maness <chris@chrismaness.com> Cc: freebsd-questions@freebsd.org Subject: Re: freebsd-update and mergemaster Message-ID: <4463w34xae.fsf@be-well.ilk.org> In-Reply-To: <47CA2C53.8050209@chrismaness.com> (Chris Maness's message of "Sat\, 01 Mar 2008 20\:25\:55 -0800") References: <47CA2C53.8050209@chrismaness.com>
next in thread | previous in thread | raw e-mail | index | archive | help
Chris Maness <chris@chrismaness.com> writes: > I was wondering if it was possible to use mergemaster with the binary > update tool. It seemed like a much better way than freebsd-update > dumping me into vi. I don't understand what it wants me to do with > vi. Mergemaster is very clear. Can someone please shed light. Mergemaster just uses sdiff(1). Perhaps freebsd-update can be configured (e.g., with an EDITOR setting) to do the same?
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?4463w34xae.fsf>