Date: Tue, 25 Jul 2000 21:27:54 -0500 From: "David J. Kanter" <djkanter@northwestern.edu> To: Forrest Aldrich <forrie@forrie.com> Cc: freebsd-questions@freebsd.org Subject: Re: Mergemaster usage Message-ID: <20000725212754.A66339@localhost.localdomain> In-Reply-To: <4.3.2.7.2.20000725160800.00c62310@64.20.73.233>; from forrie@forrie.com on Tue, Jul 25, 2000 at 04:14:05PM -0400 References: <4.3.2.7.2.20000725160800.00c62310@64.20.73.233>
next in thread | previous in thread | raw e-mail | index | archive | help
On Tue, Jul 25, 2000 at 04:14:05PM -0400, Forrest Aldrich wrote: > mergemaster ---end quoted text--- Why don't you try this, more explicit, example. It's what I use: /usr/sbin/mergemaster -v -t /usr/tmp/root.$(DATE) -w 120 2>&1 | tee /usr/tmp/merge.$(DATE); It's from a Makefile posted on FreeBSD Diary, with some adjustments. Oh, make sure /usr/tmp exists first. It'll take a few uses to become more comfortable with mergemaster, but once you get it you'll be quite glad. -- David Kanter djkanter@northwestern.edu 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?20000725212754.A66339>