in reply to Comparing two text files and marking differences
If you have an ancestral version of the document, prior to both sets of changes, the diff3 tool is likely to be useful.