From owner-freebsd-stable Wed Nov 15 15:21: 5 2000 Delivered-To: freebsd-stable@freebsd.org Received: from dt051n37.san.rr.com (dt051n37.san.rr.com [204.210.32.55]) by hub.freebsd.org (Postfix) with ESMTP id 7DDD137B479 for ; Wed, 15 Nov 2000 15:21:03 -0800 (PST) Received: from slave (Studded@slave [10.0.0.1]) by dt051n37.san.rr.com (8.9.3/8.9.3) with ESMTP id PAA21477; Wed, 15 Nov 2000 15:20:55 -0800 (PST) (envelope-from DougB@gorean.org) Date: Wed, 15 Nov 2000 15:20:55 -0800 (PST) From: Doug Barton X-Sender: doug@dt051n37.san.rr.com To: Doug Denault Cc: FreeBSD stable Subject: Re: mergemaster wishlist In-Reply-To: Message-ID: MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII Sender: owner-freebsd-stable@FreeBSD.ORG Precedence: bulk X-Loop: FreeBSD.ORG On Wed, 15 Nov 2000, Doug Denault wrote: > An awesome piece of work. I have but two wishes, saving one for later :) > > 1) a log mergemaster 2>&1 | tee ~/mergemaster.log > 2) an option that says in effect overwrite all the files I did not > modify. You didn't read the rest of that thread. :) Doug -- Life is an essay test. Long form. Spelling counts. Do YOU Yahoo!? To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-stable" in the body of the message