The TrackBack Difference List
The Difference List dock shows a list of all the differences between the two files, along with context from the change itself. There are buttons to merge changes to the right file and restore a change to it's original state.