From owner-freebsd-hackers Mon Dec 22 20:20:21 1997 Return-Path: Received: (from majordom@localhost) by hub.freebsd.org (8.8.7/8.8.7) id UAA28180 for hackers-outgoing; Mon, 22 Dec 1997 20:20:21 -0800 (PST) (envelope-from owner-freebsd-hackers@FreeBSD.ORG) Received: from alpo.whistle.com (alpo.whistle.com [207.76.204.38]) by hub.freebsd.org (8.8.7/8.8.7) with ESMTP id UAA28161 for ; Mon, 22 Dec 1997 20:20:08 -0800 (PST) (envelope-from julian@whistle.com) Received: (from daemon@localhost) by alpo.whistle.com (8.8.5/8.8.5) id UAA00945 for ; Mon, 22 Dec 1997 20:14:34 -0800 (PST) Received: from UNKNOWN(), claiming to be "current1.whistle.com" via SMTP by alpo.whistle.com, id smtpd000943; Mon Dec 22 20:14:28 1997 Message-ID: <349F39FA.41C67EA6@whistle.com> Date: Mon, 22 Dec 1997 20:11:38 -0800 From: Julian Elischer Organization: Whistle Communications X-Mailer: Mozilla 3.0Gold (X11; I; FreeBSD 2.2-CURRENT i386) MIME-Version: 1.0 To: hackers@FreeBSD.ORG Subject: Summary: GUI based diff References: <199712222340.PAA02960@rah.star-gate.com> Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 7bit Sender: owner-freebsd-hackers@FreeBSD.ORG Precedence: bulk I received 5 pointers to this. I'm pretty sure that mgdiff (in ports/textutils/mgdiff is the one I was looking for. (who'd have thought of looking for it in textutils?) the other files were: tkdiff, part of tkCVS... xemacs e-diff part of emacs I guess (I don't use emacs) xdiff (I haven't seen this yet) and http://www.doitnow.com/~quillan/john/tkxcd tkdiff and tkxcd allow you to examine diffs but don't seem to allow you to use it as a merge tool. mgdiff does allow you to select which diff to choose where and can output the result. It doesn't however allow you to edit the result while merging, which I definitly remember being able to do on one version.. (maybe it was commercial) jkh has a binary mgdiff at: Sounds a bit like mgdiff, to me. I've stashed a copy for you at ftp://freebsd.org/pub/jkh/mgdiff but you need to grap the Mgdiff.ad file from the sources (and put it in your $HOME) to get it in all it's glory.