Merge "diff: Wrap condition around brackets for more readability"