First cut at displaying the diffs for a merge.