From owner-cvs-all Tue Jan 28 11: 3:59 2003 Delivered-To: cvs-all@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 76E1737B401; Tue, 28 Jan 2003 11:03:58 -0800 (PST) Received: from mail.rpi.edu (mail.rpi.edu [128.113.2.7]) by mx1.FreeBSD.org (Postfix) with ESMTP id AC9E943F3F; Tue, 28 Jan 2003 11:03:57 -0800 (PST) (envelope-from drosih@rpi.edu) Received: from [128.113.24.47] (gilead.netel.rpi.edu [128.113.24.47]) by mail.rpi.edu (8.12.1/8.12.1) with ESMTP id h0SJ3tPH048674; Tue, 28 Jan 2003 14:03:55 -0500 Mime-Version: 1.0 X-Sender: drosih@mail.rpi.edu Message-Id: In-Reply-To: <200301281844.h0SIie3G086935@repoman.freebsd.org> References: <200301281844.h0SIie3G086935@repoman.freebsd.org> Date: Tue, 28 Jan 2003 14:03:54 -0500 To: Matt Dillon , cvs-committers@FreeBSD.org, cvs-all@FreeBSD.org From: Garance A Drosihn Subject: Re: cvs commit: src/usr.sbin/mergemaster mergemaster.sh Content-Type: text/plain; charset="us-ascii" ; format="flowed" X-Scanned-By: MIMEDefang 2.3 (www dot roaringpenguin dot com slash mimedefang) Sender: owner-cvs-all@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG At 10:44 AM -0800 1/28/03, Matt Dillon wrote: >dillon 2003/01/28 10:44:40 PST > > Modified files: > usr.sbin/mergemaster mergemaster.sh > Log: > Backout last commit by request. Hmm. I kinda liked it, the one time I tried it. It wasn't exactly what I would like, but I'm still trying to figure out how I would prefer to see it behave. -- Garance Alistair Drosehn = gad@gilead.netel.rpi.edu Senior Systems Programmer or gad@freebsd.org Rensselaer Polytechnic Institute or drosih@rpi.edu To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe cvs-all" in the body of the message