Date: Thu, 22 Mar 2007 22:25:03 +0100 From: Kyrre =?iso-8859-1?Q?Nyg=E5rd?= <kyrreny@broadpark.no> To: Pieter de Goeje <pieter@degoeje.nl>, freebsd-questions@freebsd.org Cc: questions@freebsd.org Subject: Re: Automating MERGEMASTER(8) Message-ID: <0JFB00MFGQ5T76H0@osl1sminn1.broadpark.no> In-Reply-To: <200703170029.25066.pieter@degoeje.nl> References: <7.0.1.0.2.20070316102312.04601550@broadpark.no> <200703170029.25066.pieter@degoeje.nl>
next in thread | previous in thread | raw e-mail | index | archive | help
At 00:29 17.03.2007, Pieter de Goeje wrote: >On Friday 16 March 2007 10:32, Kyrre Nyg=E5rd wrote: > > Hello, > > > > Is it possible to make MERGEMASTER(8) automatically replace files > > with a FreeBSD CVS Id, and skip (or prompt interactively) the ones > > without a FreeBSD CVS Id? The ones without are most certainly my own > > personalized configuration files. I'd really like to keep them > > intact. And on every MERGEMASTER(8) session I tend to replace every > > single file but them. > > > > Thanks everyone! > > > > All the best, > > Kyrre >mergemaster -U > >Cheers, > >Pieter aaaaaaaaaah thanks a lot man :D=20
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?0JFB00MFGQ5T76H0>