On Sun, Jan 08, 2006 at 02:46:51PM +0000, Christian Weisgerber wrote: > Han Boetes <[EMAIL PROTECTED]> wrote: > > > > > Since gdiff isn't needed anymore, do you think mergemaster could be > > > > integrated in the base system one of those days, > > > > > > I'm considering this. > > > > Are you considering mergeslave as well? > > No, if only for the fact that I wasn't aware of its existence until > you mentioned it just now. > > The questions is, what *do* people use for updating /etc?
cd ~/tmp/newroot tar zxpvf /home/OpenBSD/snapshots/sgi/etc38.tgz cd etc diff -ur /etc . | less ! cp -Rp ... /etc q -- <[EMAIL PROTECTED]> > I've been using mergemaster for several years now, it's an essential > tool for me. But then again, I'm perfectly happy to just dump it > into ~/bin on my boxes if there's no general interest. > > -- > Christian "naddy" Weisgerber [EMAIL PROTECTED]
