Is there a reason to remove the new line at the end of the file? If not, could you leave the file layout, so that the diff focuses on the issue at hand?