Changed lines are marked with an icon to indicate what type of change has occurred.
![](TMerge_lineadded.png)
A line has been added.
![](TMerge_lineremoved.png)
A line has been removed.
![](TMerge_lineequal.png)
A change has been undone by reverting to the original content of the line.
![](TMerge_linewhitespace.png)
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.
![](TMerge_lineedited.png)
A line has been edited by hand, using TortoiseMerge as a text editor.
![](TMerge_lineconflicted.png)
This line is in conflict.
![](TMerge_lineconflictedignored.png)
This line is conflicted, but the effect is hidden by whitespace or line-ending settings.
![](TMerge_linemoved.png)
This line is detected as being moved from / to another location.