Date: Fri, 30 Sep 2005 09:53:42 +0100 From: Ashley Moran <work@ashleymoran.me.uk> To: freebsd-hackers@freebsd.org Subject: Re: A smarter mergemaster Message-ID: <433CFD16.6060200@ashleymoran.me.uk> In-Reply-To: <200509301041.10480.doconnor@gsoft.com.au> References: <20050929224548.GB3035@comp.chem.msu.su> <200509301041.10480.doconnor@gsoft.com.au>
next in thread | previous in thread | raw e-mail | index | archive | help
Daniel O'Connor wrote: > This work does look neat, but.. > Try etcmerge :) > It's a bit of a pain to get started with it, but it is a *lot* faster (human > input wise) than mergemaster. It only asks you about files that you have > modified rather than ones that have been changed by committers (ie does a 3 > way merge). > > It does have problems handling DB files, but that is usually not a big problem > to fix. > I read about etcmerge in BSD Hacks and there's been no going back for me. It seems pretty stable even though it's not been updated for a good while. Is there any chance it will ever make it into the FreeBSD core system? Ashley
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?433CFD16.6060200>