From owner-freebsd-stable Thu Jan 28 08:52:47 1999 Return-Path: Received: (from majordom@localhost) by hub.freebsd.org (8.8.8/8.8.8) id IAA10272 for freebsd-stable-outgoing; Thu, 28 Jan 1999 08:52:47 -0800 (PST) (envelope-from owner-freebsd-stable@FreeBSD.ORG) Received: from dt050n08.san.rr.com (dt050n08.san.rr.com [204.210.31.8]) by hub.freebsd.org (8.8.8/8.8.8) with ESMTP id IAA10263 for ; Thu, 28 Jan 1999 08:52:44 -0800 (PST) (envelope-from Studded@gorean.org) Received: from gorean.org (master [10.0.0.2]) by dt050n08.san.rr.com (8.8.8/8.8.8) with ESMTP id IAA05818; Thu, 28 Jan 1999 08:52:25 -0800 (PST) (envelope-from Studded@gorean.org) Message-ID: <36B095C5.E9074223@gorean.org> Date: Thu, 28 Jan 1999 08:52:21 -0800 From: Studded Organization: Triborough Bridge & Tunnel Authority X-Mailer: Mozilla 4.5 [en] (Win98; I) X-Accept-Language: en MIME-Version: 1.0 To: "Louis A. Mamakos" CC: "Matthew D. Fuller" , Gregory Bond , Chris Knight , freebsd-stable@FreeBSD.ORG Subject: Re: mergemaster rocks! References: <199901280812.TAA29221@lightning.itga.com.au> <19990128024920.C16540@futuresouth.com> <199901281431.JAA30813@whizzo.transsys.com> Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 7bit Sender: owner-freebsd-stable@FreeBSD.ORG Precedence: bulk X-Loop: FreeBSD.ORG "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. Ok, I'll stick that on the list. That should be easy to do. Doug (who hopes he doesn't run out of letters for option flags... :) -- *** Chief Operations Officer, DALnet IRC network *** Like desperadoes waiting for a train . . . To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-stable" in the body of the message