From owner-freebsd-stable Thu Jan 28 07:33:02 1999 Return-Path: Received: (from majordom@localhost) by hub.freebsd.org (8.8.8/8.8.8) id HAA01253 for freebsd-stable-outgoing; Thu, 28 Jan 1999 07:33:02 -0800 (PST) (envelope-from owner-freebsd-stable@FreeBSD.ORG) Received: from gw-nl3.philips.com (gw-nl3.philips.com [192.68.44.35]) by hub.freebsd.org (8.8.8/8.8.8) with ESMTP id HAA01247 for ; Thu, 28 Jan 1999 07:33:01 -0800 (PST) (envelope-from Jos.Backus@nl.origin-it.com) Received: from smtprelay-nl1.philips.com (localhost.philips.com [127.0.0.1]) by gw-nl3.philips.com with ESMTP id QAA22056 for ; Thu, 28 Jan 1999 16:32:55 +0100 (MET) (envelope-from Jos.Backus@nl.origin-it.com) Received: from smtprelay-eur1.philips.com(130.139.36.3) by gw-nl3.philips.com via mwrap (4.0a) id xma022047; Thu, 28 Jan 99 16:32:55 +0100 Received: from hal.mpn.cp.philips.com (hal.mpn.cp.philips.com [130.139.64.195]) by smtprelay-nl1.philips.com (8.8.5/8.6.10-1.2.2m-970826) with SMTP id QAA22468 for ; Thu, 28 Jan 1999 16:32:53 +0100 (MET) Received: (qmail 36892 invoked by uid 666); 28 Jan 1999 15:33:14 -0000 Date: Thu, 28 Jan 1999 16:33:14 +0100 From: Jos Backus To: freebsd-stable@FreeBSD.ORG Subject: Re: mergemaster rocks! Message-ID: <19990128163314.F80672@hal.mpn.cp.philips.com> Reply-To: Jos Backus References: <199901280812.TAA29221@lightning.itga.com.au> <19990128024920.C16540@futuresouth.com> <199901281431.JAA30813@whizzo.transsys.com> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Mailer: Mutt 0.95.1i In-Reply-To: <199901281431.JAA30813@whizzo.transsys.com>; from Louis A. Mamakos on Thu, Jan 28, 1999 at 09:31:05AM -0500 Sender: owner-freebsd-stable@FreeBSD.ORG Precedence: bulk X-Loop: FreeBSD.ORG On Thu, Jan 28, 1999 at 09:31:05AM -0500, Louis A. Mamakos wrote: > It would also be nice if you could specify your own replacement for > 'sdiff'. I'd much prefer to use ediff mode inside of emacs to do the > merging.. I end up doing this by hand after the fact. Another idea: if, say, your PAGER lives in /usr/local/bin, make it find it: --- mergemaster.orig Thu Jan 28 16:31:16 1999 +++ mergemaster Thu Jan 28 16:31:55 1999 @@ -12,6 +12,7 @@ # $Date: 1998/09/28 03:40:04 $ PATH=/bin:/usr/bin:/usr/sbin +test -d /usr/local/bin && PATH=/usr/local/bin:$PATH display_usage ( ) { VERSION_NUMBER=`grep "[$]Revision:" $0 | cut -d ' ' -f 3` Cheers, -- Jos Backus _/ _/_/_/ "Reliability means never _/ _/ _/ having to say you're sorry." _/ _/_/_/ -- D. J. Bernstein _/ _/ _/ _/ Jos.Backus@nl.origin-it.com _/_/ _/_/_/ use Std::Disclaimer; To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-stable" in the body of the message