The text that was changed in either version of a line is highlighted. After you edit the text, the highlighting will be gone.