a unique merging problem

[Gobind Bansal]

Hello,   I have two copies of the same text document. I make changes at different places in the two copies. Now I need to update/integrate/merge the two copies into one.   Can I use cvs for this purpose? I do not mind adding or changing some cvs code... but unfortunately I am unaware as yet where to make changes.   Another hassle is that the text document is in the form of strings and not files.   Any kind of help is awaited and appreciated   Thanx   gobind bansal institute of information systems eth zurich switzerland