From owner-freebsd-ports Sat Apr 17 5:29:47 1999 Delivered-To: freebsd-ports@freebsd.org Received: from hydra.RoBIN.de (ns.robin.de [193.174.7.1]) by hub.freebsd.org (Postfix) with ESMTP id 82C9E14D5F for ; Sat, 17 Apr 1999 05:29:44 -0700 (PDT) (envelope-from andreas@marvin.robin.de) Received: from marvin.robin.de (masklin.robin.de [193.174.7.66]) by hydra.RoBIN.de (8.8.8/8.8.5) with ESMTP id OAA17866; Sat, 17 Apr 1999 14:27:13 +0200 Message-ID: <371861C6.C8297091@marvin.robin.de> Date: Sat, 17 Apr 1999 12:26:14 +0200 From: Andreas Lohr X-Mailer: Mozilla 4.5 [en] (X11; I; FreeBSD 3.1-RELEASE i386) X-Accept-Language: en MIME-Version: 1.0 To: Rich Winkel Cc: ports@freebsd.org, alo@ms.com Subject: Re: FreeBSD Port: mgdiff-1.0 References: <199903292028.OAA29581@chumbly.math.missouri.edu> Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 7bit Sender: owner-freebsd-ports@FreeBSD.ORG Precedence: bulk X-Loop: FreeBSD.org Rich, sorry for the late reply, but I have been away from home for a while, you may want to use my other email address alo@ms.com in the future. I do not know mergemaster, but I can image what it used for. If you are seriously considering enhancing mgdiff, then have a look tkdiff which is a gui frontend for diff based on Tcl/Tk. Andreas Rich Winkel wrote: > > This would a fantastic utility for updating /etc files, in conjunction with mergemaster. > Unfortunately it's missing two important capabilities: > The ability to simultaneously select two differing blocks, so they're > both in the merged output. > The ability to individually select or unselect lines within a block. > > I hope someone can add this functionality, before I try to undertake it myself :-) > > Thanks!!!!!!!!!! > > Rich To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-ports" in the body of the message