So what I???m really looking for is an application that does a really good ???diff??? between two plain text files, shows both versions side by side, highlights the differences, and provides a good interface for moving through each of the differences and merging the files.