Date: Sat, 17 Mar 2007 00:29:24 +0100 From: Pieter de Goeje <pieter@degoeje.nl> To: freebsd-questions@freebsd.org Cc: questions@freebsd.org, Kyrre =?iso-8859-1?q?Nyg=E5rd?= <kyrreny@broadpark.no> Subject: Re: Automating MERGEMASTER(8) Message-ID: <200703170029.25066.pieter@degoeje.nl> In-Reply-To: <7.0.1.0.2.20070316102312.04601550@broadpark.no> References: <7.0.1.0.2.20070316102312.04601550@broadpark.no>
next in thread | previous in thread | raw e-mail | index | archive | help
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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200703170029.25066.pieter>