Path: utzoo!utgpu!watserv1!watmath!uunet!bu.edu!bu-cs!lectroid!pretzel!jberk
From: jberk@pretzel.sw.stratus.com (Joe Berkovitz)
Newsgroups: gnu.emacs
Subject: auto-merge in GNU Emacs
Message-ID: <665@lectroid.sw.stratus.com>
Date: 1 Feb 90 17:59:35 GMT
Sender: usenet@lectroid.sw.stratus.com
Reply-To: jberk@pretzel.sw.stratus.com (Joe Berkovitz)
Organization: Stratus Computer
Lines: 21

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?

This is for use in situations where a source file has been
modified in parallel by two people, and the two sets of changes
need to be reconciled.  It would be nice to have emacs put up
the two originals and the merged output in 3 different buffers,
and have it walk one through the different merged areas to
inspect and approve or recursively edit each change.  I suspect
that "diff3" or "diff" could be invoked as a child process to
do most of the comparison work; emacs would merely need to
scan the resulting output for line numbers, etc.

If no one knows of such, I may end up doing it myself and posting
the results anyway.  

Thanks much,

Joe Berkovitz @ Stratus Computer, Inc.
(jberk@pretzel.sw.stratus.com)