Merge "Starting to implement side-by-side diff."