Path: utzoo!utgpu!news-server.csri.toronto.edu!rpi!uwm.edu!spool.mu.edu!sdd.hp.com!caen!ox.com!msen.com!emv From: moss@cs.umass.edu (Eliot Moss) Newsgroups: comp.archives Subject: [emacs...] Re: anyone have some diff'ing lisp code for GNU emacs Message-ID: <1991Apr6.212045.13642@ox.com> Date: 6 Apr 91 21:20:45 GMT References: <283@gradient.gradient.com> Sender: emv@msen.com (Edward Vielmetti, MSEN) Reply-To: moss@cs.umass.edu Followup-To: comp.emacs Organization: Dept of Comp and Info Sci, Univ of Mass (Amherst) Lines: 19 Approved: emv@msen.com (Edward Vielmetti, MSEN) X-Original-Newsgroups: comp.emacs,gnu.emacs.help Archive-name: text/diff/emerge/1991-04-03 Archive: tut.cis.ohio-state.edu:/pub/gnu/emacs/elisp-archive/as-is/emerge.el.Z [128.146.8.60] Original-posting-by: moss@cs.umass.edu (Eliot Moss) Original-subject: Re: anyone have some diff'ing lisp code for GNU emacs Reposted-by: emv@msen.com (Edward Vielmetti, MSEN) I prefer the emerge package, which not only does the diff, but displays the two files side by side and in a third window allows you to go through and decide which version of each differing region you desire to have in a merged file. Very handy! You can get it from the author, Dale R. Worley, drw@math.mit.edu. -- J. Eliot B. Moss, Assistant Professor Department of Computer and Information Science Lederle Graduate Research Center University of Massachusetts Amherst, MA 01003 (413) 545-4206, 545-1249 (fax); Moss@cs.umass.edu