is the difference just line-ending? I would recommend configure your git to commit unix style line-ending only.

see https://help.github.com/articles/dealing-with-line-endings