Two-way Text Comparison Screenshot

 

 

Here is a screen shot of a 2-way text comparison view:

2-way Text Comparisons consider all the differences as conflicts, that's why all the inserted/deleted/modified blocks have a red border.