Rework the merge algorithm.  It now only works for text files.  But,
it no longer gets confused by line endings versus \n) and it
reports conflicts.