I have some project in which I have to deal with similar text files merging. Is there any java package for this task? If no, does anyone know how CVS (or any other version control tool) deals with such merging operations? I mean based on what? Any personal idea is welcome as well for such policy.

Thanks in advance.