the real issue here was that the indentation level didn't correspond with the nesting of the functions (so the closing bracket for this function was indented, even though it was the outermost function), not breaking the line... if the diff looks ugly, try using smartgit or some other diff viewer.