TortoiseGitMerge Manual

Changed lines are marked with an icon to indicate what type of change has occurred.

A line has been added.

A line has been removed.

A change has been undone by reverting to the original content of the line.

This line contains only whitespace changes. Where several consecutive lines are marked, the paragraph may have been re-wrapped, causing words to shuffle onto adjacent lines.

A line has been edited by hand, using TortoiseGitMerge as a text editor.

This line is in conflict.

This line is conflicted, but the effect is hidden by whitespace or line-ending settings.

This line is detected as being moved from / to another location.