Merge "Document that new side-by-side diff screen can't show line endings"