🚀 go-pugleaf

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.

However, there is no way that I want this to happen automatically.  What
I would like is:
  1) A two-up listing of each file which is different, showing where the
     differences are and what they are.
  2) An interactive program which will take as input the two different files,
     and for each section which is different, prompt me interactively
     as to whether one or the other or both should be included in a
     third, output file.  I would also like an option to flag a block
     of just-included text so that I can look at it later and make
     modifications in an editor.

Since I'm sure I'm not the first person in the world to need to do
this, I thought I'd post this request for any programs that anyone
might have which do what I ask.  I know about diff and sccs, but they
seem to have an awful lot more complexity than the fairly simple
functions listed above that I want.  Thanks for any pointers or help,
-- 
-------------------------------------------------------------------
Lorien Y. Pratt                            Computer Science Department
pratt@paul.rutgers.edu                     Rutgers University
                                           Busch Campus
(201) 932-4714                             Piscataway, NJ  08854