From owner-freebsd-current@FreeBSD.ORG Mon Aug 30 21:08:20 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 9F50316A4CE; Mon, 30 Aug 2004 21:08:20 +0000 (GMT) Received: from wrzx35.rz.uni-wuerzburg.de (wrzx35.rz.uni-wuerzburg.de [132.187.3.35]) by mx1.FreeBSD.org (Postfix) with ESMTP id CD25B43D49; Mon, 30 Aug 2004 21:08:19 +0000 (GMT) (envelope-from q@uni.de) Received: from wrzx30.rz.uni-wuerzburg.de (wrzx30.rz.uni-wuerzburg.de [132.187.1.30]) by wrzx35.rz.uni-wuerzburg.de (Postfix) with ESMTP id 89F7DD9C5A; Mon, 30 Aug 2004 23:08:18 +0200 (CEST) Received: from virusscan (localhost [127.0.0.1]) by wrzx30.rz.uni-wuerzburg.de (Postfix) with ESMTP id 6313480275; Mon, 30 Aug 2004 23:08:18 +0200 (CEST) Received: from wrzx28.rz.uni-wuerzburg.de (wrzx28.rz.uni-wuerzburg.de [132.187.3.28]) by wrzx30.rz.uni-wuerzburg.de (Postfix) with ESMTP id 4177A76764; Mon, 30 Aug 2004 23:08:18 +0200 (CEST) Received: from coyote.q.local (wwsx14.win-screen.uni-wuerzburg.de [132.187.253.14]) by wrzx28.rz.uni-wuerzburg.de (Postfix) with ESMTP id 2D214D18A6; Mon, 30 Aug 2004 23:08:18 +0200 (CEST) Received: from igor.q.local (igor [192.168.0.148]) by coyote.q.local (8.12.10/8.12.10) with ESMTP id i7UL8ITH035444; Mon, 30 Aug 2004 23:08:18 +0200 (CEST) (envelope-from q@igor.q.local) Received: from igor.q.local (localhost [127.0.0.1]) by igor.q.local (8.13.1/8.13.1) with ESMTP id i7UL8HQd004529; Mon, 30 Aug 2004 23:08:17 +0200 (CEST) (envelope-from q@igor.q.local) Received: (from q@localhost) by igor.q.local (8.13.1/8.13.1/Submit) id i7UL8HGU004528; Mon, 30 Aug 2004 23:08:17 +0200 (CEST) (envelope-from q) Date: Mon, 30 Aug 2004 23:08:17 +0200 From: Ulrich Spoerlein To: "David O'Brien" Message-ID: <20040830210817.GB749@galgenberg.net> Mail-Followup-To: David O'Brien , Kenneth Stailey , freebsd-current@freebsd.org References: <20040829213449.GA33843@hub.freebsd.org> <20040830135311.11040.qmail@web50603.mail.yahoo.com> <20040830163106.GA19044@dragon.nuxi.com> Mime-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="yNb1oOkm5a9FJOVX" Content-Disposition: inline In-Reply-To: <20040830163106.GA19044@dragon.nuxi.com> User-Agent: Mutt/1.5.6i X-Virus-Scanned: by amavisd-new (Rechenzentrum Universitaet Wuerzburg) cc: Kenneth Stailey 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 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 21:08:20 -0000 --yNb1oOkm5a9FJOVX Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Mon, 30.08.2004 at 09:31:06 -0700, David O'Brien wrote: > > mergemasters is gross. Have you ever tried to run it on an 80-column d= isplay? > > 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. >=20 > LOL!! This is not funny. I myself have to think loud about which button to press. 'r' is on the left keyboard side and 'l' is to the right. Not good. Better would be something like unison, where you use ,/. or (but this >< thing is on the same key on a german keyboard...) > 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. Looks like one can't configure the used keys... Ulrich Spoerlein --=20 PGP Key ID: F0DB9F44 Get it while it's hot! PGP Fingerprint: F1CE D062 0CA9 ADE3 349B 2FE8 980A C6B5 F0DB 9F44 "They that can give up essential liberty to obtain a little temporary safety deserve neither liberty nor safety." -- Benjamin Franklin --yNb1oOkm5a9FJOVX Content-Type: application/pgp-signature Content-Disposition: inline -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.2.5 (FreeBSD) iD8DBQFBM5dBmArGtfDbn0QRAmXsAKDK75+eYcj+ZF3KswAgpK4gnhp6rACgsCrH PBTMWZLliXNBE1TwpF1W+Dc= =6GCj -----END PGP SIGNATURE----- --yNb1oOkm5a9FJOVX--