Date: Wed, 17 Oct 2001 02:43:31 +0200 (CEST) From: Cyrille Lefevre <clefevre@citeweb.net> To: "Jonathan M. Slivko" <jslivko@4evermail.com> Cc: freebsd-questions@freebsd.org, freebsd-stable@freebsd.org Subject: Re: mergemaster -- whats the best way? Message-ID: <200110170043.f9H0hVc04459@gits.dyndns.org> In-Reply-To: <001301c15671$6b2effe0$252da818@sioux>
next in thread | previous in thread | raw e-mail | index | archive | help
Jonathan M. Slivko wrote: > > Whats the best way about going to do a mergemaster without having to read > through every single change, modification, etc. Is there some kind of script > that will automatically merge the changes into the existing files without > much user intervention? (e.g. unattended?) use these both sequences, only manually required changes will be prompted. mergemaster -svia mergemaster -vir # or -svir see the manual pages for details or search the -freebsd mailing lists. Cyrille. -- Cyrille Lefevre mailto:clefevre@citeweb.net To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-questions" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200110170043.f9H0hVc04459>