Understanding differences and merge points

A difference is an area in the contributor panes that represents a difference between the base contributor and at least one of the other contributors.

A merge point is an area in the merge results pane that corresponds to a resolved or unresolved difference between contributors in the contributor panes. A merge point is marked by an arrow in the margin of the merge results pane. A red arrow indicates the current merge point that corresponds to the current difference.

A check mark next to the merge point indicates that the differences corresponding to this merge point have been resolved.