[960987] Added most of the key code for displaying diffs