From owner-freebsd-current@FreeBSD.ORG Mon Aug 30 16:31:08 2004 Return-Path: Delivered-To: freebsd-current@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 18E9E16A4CE for ; Mon, 30 Aug 2004 16:31:08 +0000 (GMT) Received: from TRANG.nuxi.com (trang.nuxi.com [66.93.134.19]) by mx1.FreeBSD.org (Postfix) with ESMTP id BB1CA43D49 for ; Mon, 30 Aug 2004 16:31:07 +0000 (GMT) (envelope-from obrien@NUXI.com) Received: from dragon.nuxi.com (obrien@localhost [127.0.0.1]) by TRANG.nuxi.com (8.13.1/8.12.11) with ESMTP id i7UGV78C019288; Mon, 30 Aug 2004 09:31:07 -0700 (PDT) (envelope-from obrien@dragon.nuxi.com) Received: (from obrien@localhost) by dragon.nuxi.com (8.13.1/8.13.1/Submit) id i7UGV6ih019287; Mon, 30 Aug 2004 09:31:06 -0700 (PDT) (envelope-from obrien) Date: Mon, 30 Aug 2004 09:31:06 -0700 From: "David O'Brien" To: Kenneth Stailey Message-ID: <20040830163106.GA19044@dragon.nuxi.com> References: <20040829213449.GA33843@hub.freebsd.org> <20040830135311.11040.qmail@web50603.mail.yahoo.com> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20040830135311.11040.qmail@web50603.mail.yahoo.com> User-Agent: Mutt/1.4.1i X-Operating-System: FreeBSD 6.0-CURRENT Organization: The NUXI BSD Group X-Pgp-Rsa-Fingerprint: B7 4D 3E E9 11 39 5F A3 90 76 5D 69 58 D9 98 7A X-Pgp-Rsa-Keyid: 1024/34F9F9D5 cc: freebsd-current@freebsd.org Subject: Re: suggestion for /usr/src/UPDATING X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list Reply-To: obrien@freebsd.org List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 30 Aug 2004 16:31:08 -0000 On Mon, Aug 30, 2004 at 06:53:11AM -0700, Kenneth Stailey wrote: > mergemasters is gross. Have you ever tried to run it on an 80-column display? > > I absolutely hate the "left" "right" stuff. You push the "l" with your right > hand and the "r" with your left for crying out loud. LOL!! Note, though, that this output has nothing to do with mergemaster -- it is sdiff(1) that is used. What you don't like is sdiff(1)'s output format. -- -- David (obrien@FreeBSD.org)