Merge "Option to display line endings"