"git am" will warn about those, at least it does for me. It's not about empty lines (with only a newline character), but about lines that end in whitespaces.
aaah sprry I totally misunderstood. I removed the trailing whitespaces and added a space between the if and (. Please check if this is good.
I'm going to check the window name stuff