Re: a unique merging problem

[Eric Siegerman]

On Tue, Jun 19, 2001 at 01:03:17PM -0400, Matthew Riechers wrote:
> > i need this merging functionality [...]
> > where i have the text documents as return
> > values of some c++ functions. if i save the text as files i am loosing
> > efficiency.
> 
> What about using diff and patch?

Or merge, from the RCS distribution.  That's the very small part
of CVS that does the actual work of merging files.  What the rest
of CVS contributes is figuring out *which* files to merge :-)  --
a problem you don't seem to have.

--

|  | /\
|-_|/  >   Eric Siegerman, Toronto, Ont.        address@hidden
|  |  /
With sufficient thrust, pigs fly just fine. However, this is not
necessarily a good idea.
        - RFC 1925 (quoting an unnamed source)