Understanding Glyphs

Glyphs help you understand the differences between files. There are three types of glyphs:

When you designate a common ancestor file, glyphs next to the lines in each file indicate when the lines differ from the corresponding lines in the ancestor:

• If a line is identical in all three files, there is no glyph.

• If a line was added to one or both of the descendants, then a plus sign (+) shows where the line was added, and the line is highlighted.

• If a line is present in the ancestor but was removed from one or both of the descendants, then a minus sign (-) shows where the line was removed, and the line is highlighted and in strikethrough font.

• If a line is in the ancestor but has been edited in one or both of the descendants, then a vertical bar (|) shows where the line was changed, and the characters that differ are highlighted.

When a difference is resolved, the glyph changes to an outline font.