Difference

When Merging discovers a line that differs between the two files to be merged (or between either of the two files and the ancestor), it marks with glyphs the lines in the two files. Together, these marked lines are called a difference. While Merging is focusing on a difference, it highlights the glyphs.