title: Merge files with different end-of-line character
body: <p>I work with GIT on Linux, and my colleague works with GIT on Windows.</p>
  
  <p>I commited some changes to a file, and my colleague commited some other changes to that file.</p>
  
  <p>My colleague pushed, and I pulled.</p>
  
  <p>Now, my entire file is a one big conflict:</p>
  
  <pre><code>&lt;&lt;&lt;&lt;&lt;&lt;&lt; HEAD
  ...
  [my version]
  ....
  =======
  ...
  [colleague's version]
  ...
  &gt;&gt;&gt;&gt;&gt;&gt;&gt; branch 'master' of https://github.com/rothariel/aimnegochat.git
  </code></pre>
  
  <p>What can I do? How can I merge the changes?</p>