Merge "Right trim diff text from visible empty lines"