Merge "Refactor type dependent unified diff displaying into separate functions"