Date: Sun, 25 Apr 93 19:58:44 EDT
From: peprbv AT cfa0 DOT harvard DOT edu (Bob Babcock)
To: djgpp AT sun DOT soe DOT clarkson DOT edu
Subject: managing diff's

How do people handle multiple, overlapping changes to GO32?  I have two sets
of changes to submit: one adds support for FCB's in exphdlr.c, the other
allows compiling with Borland C 3.1 with no warnings (when all warnings are
enabled).  I've figured out how to run diff, but it isn't a program I normally
use.  My changes overlap, and the only way I see to separate them is to
edit the difference file by hand.  This seems likely to generate errors, and
I don't know how to verify the results.