The TrackBack Difference Viewer

Difference Viewer shows the differences between versions of the file with colorful overlays hightlighting changes.

The overlays can be double-clicked to merge changes from the left to the right, and back again.