title: Git cant diff or merge .cs file in utf-16 encoding
body: <p>A friend and I were working on the same .cs file at the same time and when there's a merge conflict git points out there's a conflict but the file isnt loaded with the usual "HEAD" ">>>" stuff because the .cs files were binary files. So we added numerous things (*.cs text and so on)- to our .gitattributes file to make git treat it as a text file which didnt work. </p>
  
  <p>Thats when we realized that git could diff other .cs files and just not this one. The reason for that is because its in unicode encoding as it contains some chinese characters. </p>
  
  <p>So how do we make git diff or merge files that are in utf-16 or utf-8 format?</p>
  
  <p>The furstrating thing is that if i push, gitlab shows exactly whats different. So I dont get how git can diff on the server but not with bash.</p>