Merging two different files

[justinfisher]

Does anyone know how to merge two files with these conditions:

They are two different versions of the same file, each modified with
different information,.

Has anyone had direct experience with this?