Path: utzoo!attcan!uunet!lll-winken!ames!mailrus!csd4.milw.wisc.edu!nic.MR.NET!srcsip!slam!schrag
From: schrag@slam.SRC.Honeywell.COM (Bob Schrag)
Newsgroups: comp.emacs
Subject: merge-file-versions for GNU?
Message-ID: <14970@srcsip.UUCP>
Date: 18 Jan 89 05:58:50 GMT
Sender: news@src.honeywell.COM
Lines: 22

To help support our configuration management, we are looking for a utility
to compare two divergently modified copies of the same original file, and
under interactive user direction, merge common and selected disparate text
sections into a single result file.  Does anybody have such a utility that
they would be willing to share?

A utility that worked by interface to the unix "diff" facility would be
acceptable for our purpose; in fact, the desired function should probably
be a lot like diff in its identification of disparate sections.  (Of
course, if the described utility already existed under Unix, without Emacs,
I guess that would be okay too.)

I think Symbolics has something like this for their Lisp/Emacs, but I don't
know of anything in the public domain.

Thanks,
Bob

Robert C. Schrag         Honeywell Systems & Research Center
MN65-2100		 3660 Technology Drive, Minneapolis, MN 55418
(612) 782-7310		 Internet: schrag@src.honeywell.com 
UUCP: srcsip		 bang-style: {bthpyd,umn-cs,ems}!srcsip!schrag