Merge "Break long lines in includes/diff/"