Xref: utzoo comp.emacs:10449 gnu.emacs.help:1636 Path: utzoo!utgpu!news-server.csri.toronto.edu!rpi!zaphod.mps.ohio-state.edu!samsung!crackers!m2c!umvlsi!dime!dime.cs.umass.edu!moss From: moss@cs.umass.edu (Eliot Moss) Newsgroups: comp.emacs,gnu.emacs.help Subject: Re: anyone have some diff'ing lisp code for GNU emacs Message-ID: Date: 3 Apr 91 14:12:47 GMT References: <283@gradient.gradient.com> Sender: news@dime.cs.umass.edu Reply-To: moss@cs.umass.edu Followup-To: comp.emacs Organization: Dept of Comp and Info Sci, Univ of Mass (Amherst) Lines: 13 In-reply-to: robin@gradient.gradient.com's message of 2 Apr 91 14:54:36 GMT 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