OT - CVS-like merge for dumpfs / relica with sources

Hi,

Any ideas on a script to do a CVS like merge of two
incompatable versions (overlapping changes)
of a file in the dump filesystem.

I assume this is fairly easy using just diff/awk/sed etc
but I cannot see how to do it...

This would also be handy when doing a replica only to discover that
"the labs" (tm) has fixed parts of a file you are also working on and you
want to merge their changes with yours...

-Steve