Path: utzoo!dciem!nrcaer!scs!spl1!laidbak!att!chinet!les
From: les@chinet.chi.il.us (Leslie Mikesell)
Newsgroups: comp.software-eng
Subject: Re: Looking for a program to merge two files interactively
Message-ID: <6078@chinet.chi.il.us>
Date: 23 Jul 88 03:08:44 GMT
Article-I.D.: chinet.6078
References: <Jul.22.07.54.48.1988.21328@paul.rutgers.edu>
Reply-To: les@chinet.UUCP (Leslie Mikesell)
Distribution: na
Organization: Chinet - Public Access Unix
Lines: 12

In article <Jul.22.07.54.48.1988.21328@paul.rutgers.edu> pratt@paul.rutgers.edu (Lorien Y. Pratt) writes:
 >I have a program which consists of about 100 different files.  A couple of
 >months ago, I began two sets of modifications to this program, each of which
 >was kept in a different directory.  I now would like to merge these
 >modifications into a single program.

I've done this sort of thing by generating a file containing context diffs
and editing this file to delete the changes that I don't want to install.
Patch can then install all the changes at once.  This is not exactly an
interactive prompt like you requested, but it gives you time to get it right.

  Les Mikesell