Date: Sat, 01 Sep 2007 13:39:33 +0200 From: Peter Boosten <peter@boosten.org> To: Grant Peel <gpeel@thenetnow.com>, freebsd-questions@freebsd.org Subject: Re: Last CVSup question. Message-ID: <46D94F75.70805@boosten.org> In-Reply-To: <20070901113157.GA69446@owl.midgard.homeip.net> References: <012301c7ec8a$da6bfa60$6501a8c0@GRANT> <20070901113157.GA69446@owl.midgard.homeip.net>
next in thread | previous in thread | raw e-mail | index | archive | help
Erik Trulsson wrote: > On Sat, Sep 01, 2007 at 07:25:51AM -0400, Grant Peel wrote: >> I have always found the mergemaster process confusing. > > Mergemaster is very useful tool for updating those files. > Updating: yes, but I never managed to merge two files successfully and always end up making the modifications manually. Peter -- http://www.boosten.org
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?46D94F75.70805>