Path: utzoo!utgpu!watserv1!watmath!uunet!bu.edu!bu-cs!snorkelwacker!tut.cis.ohio-state.edu!ucbvax!decwrl!orc!mipos3!iwarp.intel.com!news
From: merlyn@iwarp.intel.com (Randal Schwartz)
Newsgroups: gnu.emacs
Subject: Re: auto-merge in GNU Emacs
Message-ID: <1990Feb1.200228.12180@iwarp.intel.com>
Date: 1 Feb 90 20:02:28 GMT
References: <665@lectroid.sw.stratus.com>
Sender: news@iwarp.intel.com
Reply-To: merlyn@iwarp.intel.com (Randal Schwartz)
Organization: Stonehenge; netaccess via Intel, Beaverton, Oregon, USA
Lines: 18
In-Reply-To: jberk@pretzel.sw.stratus.com (Joe Berkovitz)

In article <665@lectroid.sw.stratus.com>, jberk@pretzel (Joe Berkovitz) writes:
| Is there anyone who knows of (or has written) any .el code to
| interactively reconcile or merge two different revisions of
| a text file into a single copy?

I wrote some Elisp code to feed the old and new file through diff
-D___NEW___ which marks the old text and new text cleanly, and then
bound a few keys to say "select the next old chunk (discarding the new
chunk)" or "select the next new chunk (discarding the old chunk)".
That worked, more or less, but it was a bit of a kludge.  Let me know
if you want to start with that.

Just another GNU Emacs hacker,
-- 
/=Randal L. Schwartz, Stonehenge Consulting Services (503)777-0095 ==========\
| on contract to Intel's iWarp project, Beaverton, Oregon, USA, Sol III      |
| merlyn@iwarp.intel.com ...!any-MX-mailer-like-uunet!iwarp.intel.com!merlyn |
\=Cute Quote: "Welcome to Portland, Oregon, home of the California Raisins!"=/