Not sure yet. I'm reading http://timclem.wordpress.com/2012/03/01/mind-the-end-of-your-line/
and https://help.github.com/articles/dealing-with-line-endings No good solution yet.
But I can merge manually. For the future, how did you edit this file? With QtCreator Designer? With an editor?